Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Find/replace overlay: improve focus/tab order #2161 #2515

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Find/replace overlay: improve focus/tab order #2161 #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/AccessibleToolBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,9 @@ void registerActionShortcutsAtControl(Control control) {
}
}

Control getFirstControl() {
Control[] children = getChildren();
return children.length == 0 ? null : getChildren()[0];
}

}
79 changes: 79 additions & 0 deletions ...nch.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.ScrollBar;
import org.eclipse.swt.widgets.Scrollable;
import org.eclipse.swt.widgets.Shell;
Expand Down Expand Up @@ -218,6 +219,81 @@ public void reactivate() {

};

private final CustomFocusOrder customFocusOrder = new CustomFocusOrder();

private class CustomFocusOrder {
private final Listener searchBarToReplaceBar = e -> {
if (e.detail == SWT.TRAVERSE_TAB_NEXT) {
e.doit = false;
replaceBar.forceFocus();
}
};

private final Listener replaceBarToSearchBarAndTools = e -> {
switch (e.detail) {
case SWT.TRAVERSE_TAB_NEXT:
e.doit = false;
searchBar.getDropDownTool().getFirstControl().forceFocus();
break;
case SWT.TRAVERSE_TAB_PREVIOUS:
e.doit = false;
searchBar.getTextBar().forceFocus();
break;
default:
// Proceed as normal
}
};

private final Listener searchToolsToReplaceBar = e -> {
switch (e.detail) {
case SWT.TRAVERSE_TAB_PREVIOUS:
e.doit = false;
replaceBar.forceFocus();
break;
default:
// Proceed as normal
}
};

private final Listener closeToolsToReplaceTools = e -> {
switch (e.detail) {
case SWT.TRAVERSE_TAB_NEXT:
e.doit = false;
replaceBar.getDropDownTool().getFirstControl().forceFocus();
break;
default:
// Proceed as normal
}
};

private final Listener replaceToolsToCloseTools = e -> {
switch (e.detail) {
case SWT.TRAVERSE_TAB_PREVIOUS:
e.doit = false;
closeTools.getFirstControl().forceFocus();
break;
default:
// Proceed as normal
}
};

void apply() {
searchBar.getTextBar().addListener(SWT.Traverse, searchBarToReplaceBar);
replaceBar.getTextBar().addListener(SWT.Traverse, replaceBarToSearchBarAndTools);
searchBar.getDropDownTool().getFirstControl().addListener(SWT.Traverse, searchToolsToReplaceBar);
closeTools.getFirstControl().addListener(SWT.Traverse, closeToolsToReplaceTools);
replaceBar.getDropDownTool().getFirstControl().addListener(SWT.Traverse, replaceToolsToCloseTools);
}

void dispose() {
searchBar.getTextBar().removeListener(SWT.Traverse, searchBarToReplaceBar);
replaceBar.getTextBar().removeListener(SWT.Traverse, replaceBarToSearchBarAndTools);
searchBar.getDropDownTool().getFirstControl().removeListener(SWT.Traverse, searchToolsToReplaceBar);
closeTools.getFirstControl().removeListener(SWT.Traverse, closeToolsToReplaceTools);
replaceBar.getDropDownTool().getFirstControl().removeListener(SWT.Traverse, replaceToolsToCloseTools);
}
}

public FindReplaceOverlay(Shell parent, IWorkbenchPart part, IFindReplaceTarget target) {
targetPart = part;
targetControl = getTargetControl(parent, part);
Expand Down Expand Up @@ -647,6 +723,7 @@ public void focusLost(FocusEvent e) {
searchBar.addModifyListener(Event -> {
decorate();
});
searchBar.setTabList(null);
}

private void updateIncrementalSearch() {
Expand Down Expand Up @@ -710,6 +787,7 @@ private void hideReplace() {
if (!replaceBarOpen) {
return;
}
customFocusOrder.dispose();
searchBar.forceFocus();
contentAssistReplaceField = null;
replaceBarOpen = false;
Expand All @@ -728,6 +806,7 @@ private void createReplaceDialog() {
updatePlacementAndVisibility();
assignIDs();
replaceBar.forceFocus();
customFocusOrder.apply();
}

private void initializeReplaceShortcutHandlers() {
Expand Down
4 changes: 4 additions & 0 deletions ...nch.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/HistoryTextWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,8 @@ public Text getTextBar() {
return textBar;
}

AccessibleToolBar getDropDownTool() {
return tools;
}

}
Loading