Skip to content

SearchHistoryMenu: improve scrolling through selection with arrow keys #2232

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

Merged
merged 1 commit into from
Oct 11, 2024
Merged

SearchHistoryMenu: improve scrolling through selection with arrow keys #2232

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
59 changes: 45 additions & 14 deletions ...ench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/SearchHistoryMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public void shellDeactivated(ShellEvent e) {
private int width;
private Table table;
private TableColumn column;
private int selectedIndexInTable = -1;

public SearchHistoryMenu(Shell parent, HistoryStore history, Consumer<String> historyEntrySelectedCallback) {
super(parent);
Expand Down Expand Up @@ -92,28 +93,58 @@ public Control createContents(Composite parent) {
return table;
}

private void moveSelectionInTable(int indexShift) {
selectedIndexInTable += indexShift;
if (selectedIndexInTable < 0) {
selectedIndexInTable = table.getItemCount() - 1;
} else if (selectedIndexInTable > table.getItemCount() - 1) {
selectedIndexInTable = 0;
}
table.setSelection(selectedIndexInTable);
historyEntrySelectedCallback.accept(table.getSelection()[0].getText());
}

private void attachTableListeners() {
table.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
TableItem[] selection = table.getSelection();
if (selection.length == 0) {
historyEntrySelectedCallback.accept(null);
return;
table.addListener(SWT.MouseMove, event -> {
Point point = new Point(event.x, event.y);
TableItem item = table.getItem(point);
if (item != null) {
table.setSelection(item);
selectedIndexInTable = table.getSelectionIndex();
}
String text = selection[0].getText();
if (text != null) {
historyEntrySelectedCallback.accept(text);
});
table.addKeyListener(KeyListener.keyPressedAdapter(e -> {
if (e.keyCode == SWT.ARROW_DOWN) {
moveSelectionInTable(1);
e.doit = false;
} else if (e.keyCode == SWT.ARROW_UP) {
moveSelectionInTable(-1);
e.doit = false;
} else if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
notifyParentOfSelectionInput();
close();
}
historyEntrySelectedCallback.accept(null);
}));
table.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
notifyParentOfSelectionInput();
}));
table.addMouseListener(MouseListener.mouseDownAdapter(e -> {
table.notifyListeners(SWT.Selection, null);
close();
}));
table.addKeyListener(KeyListener.keyPressedAdapter(e -> {
if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
close();
}
}));
}

private void notifyParentOfSelectionInput() {
TableItem[] selection = table.getSelection();
if (selection.length == 0) {
historyEntrySelectedCallback.accept(null);
return;
}
String text = selection[0].getText();
if (text != null) {
historyEntrySelectedCallback.accept(text);
}
historyEntrySelectedCallback.accept(null);
}

private void positionShell() {
Expand Down
Loading