Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ public final Object execute(final ExecutionEvent event) {
int traversalDirection = translateToTraversalDirection(forward);
Control control = focusControl;
do {
if (control instanceof CTabFolder folder && isFinalItemInCTabFolder(folder, forward)
&& !hasHiddenItem(folder)) {
loopToFirstOrLastItem(folder, forward);
traversalDirection = translateToTraversalDirection(!forward); // we are in the second-to-last item in the given
// direction. Now, use the Traverse-event to move back by one
if (control instanceof CTabFolder) {
CTabFolder folder = getTopLevelCTabFolderInParentHierarchy(control);
if (isFinalItemInCTabFolder(folder, forward) && !hasHiddenItem(folder)) {
loopToFirstOrLastItem(folder, forward);
traversalDirection = translateToTraversalDirection(!forward);
}
}
if (control.traverse(traversalDirection)) {
return null;
Expand All @@ -59,6 +60,22 @@ public final Object execute(final ExecutionEvent event) {
return null;
}

/**
* @param c a {@code Control}.
* @return the top-level {@code CTabFolder} in the parent hierarchy.
*/
private CTabFolder getTopLevelCTabFolderInParentHierarchy(Control c) {
Control current = c;
CTabFolder ret = null;
do {
if (current instanceof CTabFolder folder) {
ret = folder;
}
current = current.getParent();
} while (current != null);
return ret;
}

private boolean hasHiddenItem(CTabFolder folder) {
return Arrays.stream(folder.getItems()).anyMatch(i -> !i.isShowing());
}
Expand Down
Loading