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

editor: perform update() before actionPerformed()

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-07-28 15:43:18 +03:00
parent 26387399c0
commit 2f13d49224
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+10 -4
View File
@@ -1184,7 +1184,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
public int getLineMarkerFreePaintersAreaOffset() {
return getLineMarkerAreaOffset() + myIconsAreaWidth + GAP_BETWEEN_ICONS_AND_FREE_PAINTERS_AREA;
}
@Override
public int getIconsAreaWidth() {
return myIconsAreaWidth;
@@ -1386,7 +1386,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
GutterIconRenderer renderer = getGutterRenderer(e);
final Project project = myEditor.getProject();
AnAction clickAction = null;
if (renderer != null && e.getButton() < 4) {
clickAction = (InputEvent.BUTTON2_MASK & e.getModifiers()) > 0
@@ -1395,7 +1395,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
if (clickAction != null) {
if (checkActionNotBlocked(clickAction, project)) {
clickAction.actionPerformed(AnActionEvent.createFromAnAction(clickAction, e, "ICON_NAVIGATION", myEditor.getDataContext()));
performAction(clickAction, e, "ICON_NAVIGATION", myEditor.getDataContext());
repaint();
}
e.consume();
@@ -1416,6 +1416,12 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
return false;
}
private static void performAction(@NotNull AnAction action, @NotNull InputEvent e, @NotNull String place, @NotNull DataContext context) {
AnActionEvent actionEvent = AnActionEvent.createFromAnAction(action, e, place, context);
action.update(actionEvent);
if (actionEvent.getPresentation().isEnabledAndVisible()) action.actionPerformed(actionEvent);
}
@Nullable
private ActiveGutterRenderer getActiveRendererByMouseEvent(final MouseEvent e) {
if (findFoldingAnchorAt(e.getX(), e.getY()) != null) {
@@ -1566,7 +1572,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
AnAction rightButtonAction = renderer.getRightButtonClickAction();
if (rightButtonAction != null) {
if (checkActionNotBlocked(rightButtonAction, myEditor.getProject())) {
rightButtonAction.actionPerformed(AnActionEvent.createFromAnAction(rightButtonAction, e, "ICON_NAVIGATION_SECONDARY_BUTTON", myEditor.getDataContext()));
performAction(rightButtonAction, e, "ICON_NAVIGATION_SECONDARY_BUTTON", myEditor.getDataContext());
}
e.consume();
}