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-200351 can't escape diff dialog when screen reader is enabled

Browse Source
This commit is contained in:
Anton Tarasov
2018-10-11 14:39:14 +03:00
parent bc30eb3149
commit a9e436b836
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/AccessibleGutterLine.java
+34 -32
View File
@@ -2,19 +2,23 @@
package com.intellij.openapi.editor.impl;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.openapi.actionSystem.CommonShortcuts;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.actionSystem.ShortcutSet;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.TextAnnotationGutterProvider;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
import com.intellij.openapi.editor.actionSystem.EditorActionManager;
import com.intellij.openapi.editor.event.CaretEvent;
import com.intellij.openapi.editor.event.CaretListener;
import com.intellij.openapi.editor.markup.ActiveGutterRenderer;
import com.intellij.openapi.editor.markup.LineMarkerRenderer;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.ui.JBColor;
import com.intellij.ui.paint.LinePainter2D;
import com.intellij.util.Consumer;
import com.intellij.util.ObjectUtils;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.accessibility.SimpleAccessible;
@@ -35,14 +39,14 @@ import java.util.List;
* @author tav
*/
class AccessibleGutterLine extends JPanel {
private static boolean actionHandlersInstalled;
private final EditorGutterComponentImpl myGutter;
private AccessibleGutterElement mySelectedElement;
// [tav] todo: soft-wrap doesn't work correctly
private final int myLogicalLineNum;
private final int myVisualLineNum;
private static boolean actionHandlerInstalled;
public static AccessibleGutterLine createAndActivate(@NotNull EditorGutterComponentImpl gutter) {
return new AccessibleGutterLine(gutter);
}
@@ -61,22 +65,18 @@ class AccessibleGutterLine extends JPanel {
mySelectedElement.paint(g);
}
private static void checkInstallActionHandlers() {
if (actionHandlersInstalled) return;
actionHandlersInstalled = true;
installActionHandler(IdeActions.ACTION_EDITOR_ESCAPE, true, (line) -> line.escape(true));
installActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_RIGHT, false, (line) -> line.moveRight());
installActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_LEFT, false, (line) -> line.moveLeft());
installActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_UP, true, (line) -> line.maybeLineChanged());
installActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN, true, (line) -> line.maybeLineChanged());
installActionHandler(IdeActions.ACTION_EDITOR_ENTER, false, (line) -> {});
installActionHandler("EditorShowGutterIconTooltip", false, (line) -> line.showTooltipIfPresent());
}
public static void installListeners(@NotNull EditorGutterComponentImpl gutter) {
checkInstallActionHandlers();
if (!actionHandlerInstalled) {
// [tav] todo: when the API is stable and open move it to ShowGutterIconTooltipAction
actionHandlerInstalled = true;
EditorActionManager.getInstance().setActionHandler("EditorShowGutterIconTooltip", new EditorActionHandler() {
@Override
protected void doExecute(@NotNull Editor editor, @Nullable Caret caret, DataContext dataContext) {
AccessibleGutterLine line = ((EditorGutterComponentImpl)editor.getGutter()).getCurrentAccessibleLine();
if (line != null) line.showTooltipIfPresent();
}
});
}
gutter.addFocusListener(new FocusAdapter() {
@Override
public void focusGained(FocusEvent e) {
@@ -89,20 +89,11 @@ class AccessibleGutterLine extends JPanel {
gutter.escapeCurrentAccessibleLine();
}
});
}
private static void installActionHandler(String actionId, boolean propagate, Consumer<AccessibleGutterLine> action) {
EditorActionManager.getInstance().setActionHandler(actionId, new EditorActionHandler() {
private final EditorActionHandler origHandler = EditorActionManager.getInstance().getActionHandler(actionId);
gutter.getEditor().getCaretModel().addCaretListener(new CaretListener() {
@Override
protected void doExecute(@NotNull Editor editor, @Nullable Caret caret, DataContext dataContext) {
AccessibleGutterLine line = ((EditorGutterComponentImpl)editor.getGutter()).getCurrentAccessibleLine();
if (propagate || line == null) {
origHandler.execute(editor, caret, dataContext);
}
if (line != null) {
action.consume(line);
}
public void caretPositionChanged(@NotNull CaretEvent event) {
AccessibleGutterLine line = gutter.getCurrentAccessibleLine();
if (line != null) line.maybeLineChanged();
}
});
}
@@ -239,9 +230,20 @@ class AccessibleGutterLine extends JPanel {
}, 0, 0, b.width, b.height);
}
installActionHandler(CommonShortcuts.ESCAPE, () -> escape(true));
installActionHandler(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0)), this::moveRight);
installActionHandler(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0)), this::moveLeft);
installActionHandler(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0)), this::moveRight);
installActionHandler(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_DOWN_MASK)), this::moveLeft);
installActionHandler(CommonShortcuts.ENTER, () -> {}); // [tav] todo: it can do something useful, e.g. forcing Screen Reader to voice
IdeFocusManager.getGlobalInstance().requestFocus(mySelectedElement, true);
}
private void installActionHandler(ShortcutSet shortcut, Runnable action) {
DumbAwareAction.create(e -> action.run()).registerCustomShortcutSet(shortcut, this);
}
@SuppressWarnings("SameParameterValue")
@NotNull
private AccessibleGutterElement addNewElement(@NotNull SimpleAccessible accessible, int x, int y, int width, int height) {