Skip to content

Adjust selection bounds for CTabRenderring #3533

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

Open
ShahzaibIbrahim wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adjust selection bounds for CTabRenderring #3533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
821d87a
Adjust selection bounds for CTabRenderring
ShahzaibIbrahim Jan 16, 2026
5e92c7d
Fix OnBottom case
ShahzaibIbrahim Jan 19, 2026
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
38 changes: 32 additions & 6 deletions ....workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.eclipse.e4.ui.workbench.renderers.swt;

import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Objects;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
Expand Down Expand Up @@ -621,17 +622,42 @@ void drawSelectedTab(int itemIndex, GC gc, Rectangle bounds) {
}

if (selectedTabHighlightColor != null) {
gc.setForeground(selectedTabHighlightColor);
gc.setBackground(selectedTabHighlightColor);
int originalLineWidth = gc.getLineWidth();
int highlightHeight = 2;
boolean highlightOnTop = drawTabHighlightOnTop;
if (onBottom) {
highlightOnTop = !highlightOnTop;
}
int highlightHeight = 2;
int verticalOffset = highlightOnTop ? 0 : bounds.height - (highlightHeight - 1);
int horizontalOffset = itemIndex == 0 || cornerSize == SQUARE_CORNER ? 0 : 1;
int widthAdjustment = cornerSize == SQUARE_CORNER ? 0 : 1;
gc.fillRectangle(bounds.x + horizontalOffset, bounds.y + verticalOffset, bounds.width - widthAdjustment,
highlightHeight);

if (highlightOnTop != onBottom && cornerSize != SQUARE_CORNER) {
// When using round tabs, extract the part of the outline that covers the
// highlight and draw it with adapted height
int[] highlightShape = Arrays.copyOfRange(tabOutlinePoints, 14, tabOutlinePoints.length - 14);
int yEnd = !highlightOnTop
? outlineBoundsForOutline.y + outlineBoundsForOutline.height - highlightHeight + 1
: highlightHeight;
highlightShape[1] = highlightShape[highlightShape.length - 1] = yEnd;
boolean gcAdvanced = gc.getAdvanced();
gc.setAdvanced(false);
gc.fillPolygon(highlightShape);
gc.setAdvanced(gcAdvanced);
} else {
// When using square tab or drawing the highlight at the bottom, simply draw a
// line
int highlightY = highlightOnTop ? outlineBoundsForOutline.y
: bounds.y + bounds.height - highlightHeight + (!onBottom ? 1 : 0);
gc.fillRectangle(outlineBoundsForOutline.x, highlightY, outlineBoundsForOutline.width, highlightHeight);
if (highlightOnTop && !onBottom) {
// Compensate for the outline being draw on top of the filled region by
// extending the highlight with an equally wide line next to the filled region
gc.setLineWidth(1);
gc.drawLine(outlineBoundsForOutline.x, highlightY + highlightHeight,
outlineBoundsForOutline.x + outlineBoundsForOutline.width, highlightY + highlightHeight);
}
}
gc.setLineWidth(originalLineWidth);
}

if (backgroundPattern != null) {
Expand Down
Loading