MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-64648 Soft wraps:Throwable at CaretModelImpl.moveToOffset() and visual defects on resizing editor after font has been changed via Ctrl+Scroll

Browse Source 
Dropping cached mappings like 'font type -> space size' on editor font size change
This commit is contained in:
Denis Zhdanov
2011-01-31 16:59:12 +03:00
parent ef6d3bf180
commit f4923f3e6f
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
+12 -1
View File
@@ -32,6 +32,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -48,7 +50,7 @@ import java.util.List;
* @author Denis Zhdanov
* @since Jun 8, 2010 12:47:32 PM
*/
public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentListener, FoldingListener {
public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentListener, FoldingListener, PropertyChangeListener {
/**
* Holds name of JVM property which presence should trigger debug-aware soft wraps processing.
@@ -155,6 +157,8 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi
EditorSettings settings = myEditor.getSettings();
myAdditionalColumnsCount = settings.getAdditionalColumnsCount();
myUseSoftWraps = settings.isUseSoftWraps();
editor.addPropertyChangeListener(this);
}
/**
@@ -582,6 +586,13 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi
executeSafely(myFoldProcessingEndTask);
}
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (EditorEx.PROP_FONT_SIZE.equals(evt.getPropertyName())) {
myDirty = true;
}
}
@Override
public void release() {
myDataMapper.release();
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
+14
View File
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -834,6 +835,12 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
indentInColumns = 0;
indentInPixels = 0;
}
public void reset() {
indentInColumns = 0;
indentInPixels = 0;
endLineOffset = 0;
}
}
public void setWidthProvider(VisibleAreaWidthProvider widthProvider) {
@@ -993,6 +1000,8 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
fontType = 0;
notifyListenersOnLineStartPosition = false;
skipToLineEnd = false;
fontType2spaceWidth.reset();
logicalLineData.reset();
}
public int getSpaceWidth() {
@@ -1149,5 +1158,10 @@ public class SoftWrapApplianceManager implements FoldingListener, DocumentListen
}
myData[index] = value;
}
public void reset() {
myShift = 0;
Arrays.fill(myData, 0);
}
}
}