Skip to content

Fix Tab navigation in split editors (revert CTabFolder workaround, requires SWT fix) #4190

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
fedejeanne merged 1 commit into from
Jul 22, 2026
+1 −66
Merged

Fix Tab navigation in split editors (revert CTabFolder workaround, requires SWT fix) #4190

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
67 changes: 1 addition & 66 deletions ....eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/handlers/TraversePageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@
*******************************************************************************/
package org.eclipse.ui.internal.handlers;
import java.lang.reflect.Method;
import java.util.Arrays;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
Expand All @@ -38,16 +35,9 @@ public final Object execute(final ExecutionEvent event) {
Control focusControl = Display.getCurrent().getFocusControl();
if (focusControl != null) {
boolean forward = "next".equals(methodName); //$NON-NLS-1$
int traversalDirection = translateToTraversalDirection(forward);
final int traversalDirection = translateToTraversalDirection(forward);
Control control = focusControl;
do {
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 @@ -60,65 +50,10 @@ 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());
}

private int translateToTraversalDirection(boolean forward) {
return forward ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS;
}

/**
* Sets the current selection to the first or last item the given direction.
*
* @param folder the CTabFolder which we want to inspect
* @param forward whether we want to traverse forwards of backwards
*/
private void loopToFirstOrLastItem(CTabFolder folder, boolean forward) {
if (forward) {
folder.showItem(folder.getItem(0));
folder.setSelection(1);
} else {
int itemCount = folder.getItemCount();
folder.setSelection(itemCount - 2);
}
}

/**
* {@return Returns whether the folder has currently selected the final item in
* the given direction.}
*
* @param folder the CTabFolder which we want to inspect
* @param forward whether we want to traverse forwards of backwards
*/
private boolean isFinalItemInCTabFolder(CTabFolder folder, boolean forward) {
CTabItem currentFolder = folder.getSelection();
CTabItem lastFolder = null;
if (forward) {
int itemCount = folder.getItemCount();
lastFolder = folder.getItem(itemCount - 1);
} else {
lastFolder = folder.getItem(0);
}
return currentFolder.equals(lastFolder);
}

/**
* Looks up the traverse(int) method on the given focus control.
*
Expand Down
Loading