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

wrap text at viewport border in DFM if it's closer than right margin (IDEA-150440)

Browse Source
This commit is contained in:
Dmitry Batrak
2016-03-29 14:39:06 +03:00
parent 8f9d2f7102
commit 55317880f3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java
+4 -3
View File
@@ -1115,12 +1115,13 @@ public class SoftWrapApplianceManager implements Dumpable {
@Override
public int getVisibleAreaWidth() {
Insets insets = myEditor.getContentComponent().getInsets();
int width = Math.max(0, myEditor.getScrollingModel().getVisibleArea().width - insets.left - insets.right);
if (myEditor.isInDistractionFreeMode()) {
int rightMargin = myEditor.getSettings().getRightMargin(myEditor.getProject());
if (rightMargin > 0) return rightMargin * EditorUtil.getPlainSpaceWidth(myEditor);
if (rightMargin > 0) width = Math.min(width, rightMargin * EditorUtil.getPlainSpaceWidth(myEditor));
}
Insets insets = myEditor.getContentComponent().getInsets();
return Math.max(0, myEditor.getScrollingModel().getVisibleArea().width - insets.left - insets.right);
return width;
}
}