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

do not move caret if clicked on the gutter inside the foldings area

Browse Source
This commit is contained in:
Egor.Ushakov
2015-10-12 19:53:25 +03:00
parent f76fcedbb0
commit 670e628d9a
1 changed files with 8 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/EditorImpl.java
+8 -1
View File
@@ -4314,6 +4314,11 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
}; };
} }
private boolean isInsideGutterOnlyFoldingArea(@NotNull MouseEvent e) {
EditorMouseEventArea area = getMouseEventArea(e);
return area == EditorMouseEventArea.FOLDING_OUTLINE_AREA &&
myGutterComponent.convertX(e.getX()) <= myGutterComponent.getWhitespaceSeparatorOffset();
}
@Override @Override
public EditorMouseEventArea getMouseEventArea(@NotNull MouseEvent e) { public EditorMouseEventArea getMouseEventArea(@NotNull MouseEvent e) {
@@ -5946,7 +5951,9 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
// are drawn) and annotations area. E.g. we don't want to change caret position if a user sets new break point (clicks // are drawn) and annotations area. E.g. we don't want to change caret position if a user sets new break point (clicks
// at 'line markers' area). // at 'line markers' area).
if (e.getSource() != myGutterComponent || if (e.getSource() != myGutterComponent ||
eventArea != EditorMouseEventArea.LINE_MARKERS_AREA && eventArea != EditorMouseEventArea.ANNOTATIONS_AREA) (eventArea != EditorMouseEventArea.LINE_MARKERS_AREA &&
eventArea != EditorMouseEventArea.ANNOTATIONS_AREA &&
!isInsideGutterOnlyFoldingArea(e)))
{ {
VisualPosition visualPosition = myUseNewRendering ? getTargetPosition(x, y, true) : null; VisualPosition visualPosition = myUseNewRendering ? getTargetPosition(x, y, true) : null;
LogicalPosition pos = myUseNewRendering ? visualToLogicalPosition(visualPosition) : getLogicalPositionForScreenPos(x, y, true); LogicalPosition pos = myUseNewRendering ? visualToLogicalPosition(visualPosition) : getLogicalPositionForScreenPos(x, y, true);