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 1 commit into
base: master
Choose a base branch
from
+22 −11
Open

Adjust selection bounds for CTabRenderring #3533

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
33 changes: 22 additions & 11 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 @@ -620,18 +621,33 @@ void drawSelectedTab(int itemIndex, GC gc, Rectangle bounds) {
gc.drawLine(startX, 0, endX, 0);
}

if (TAB_OUTLINE_WIDTH > 0) {
gc.drawPolyline(tabOutlinePoints);
}
Comment on lines +624 to +626
Copy link
Contributor

@HeikoKlare HeikoKlare Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering why the outline is now drawn first instead of after painting the highlight.
When taking a look at how it looks, it turns out that this PR now changes the placement of the highlight, such that it overwrites the outline:
image

While you do not notice that much with the default gray outline, this would look really odd if you have a colored outline. Since the gc.setForeground(tabOutlineColor) call has been accidentally removed, you will not notice as the color is simply missing.

Please move this call back or ensure by any other means that the outline remains properly drawn.


if (selectedTabHighlightColor != null) {
gc.setBackground(selectedTabHighlightColor);
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);
final int highlightHeight = 2;
if (cornerSize == SQUARE_CORNER || highlightOnTop == onBottom) {
int verticalOffset = highlightOnTop ? 0 : outlineBoundsForOutline.height - (highlightHeight - 1);
gc.fillRectangle(outlineBoundsForOutline.x,
outlineBoundsForOutline.y + verticalOffset, outlineBoundsForOutline.width, highlightHeight);
} else {
boolean gcAdvanced = gc.getAdvanced();
gc.setAdvanced(false);
int[] highlightShape = Arrays.copyOfRange(tabOutlinePoints, 12, tabOutlinePoints.length - 12);
int highlightY = highlightOnTop ? highlightHeight
: outlineBoundsForOutline.height - highlightHeight;
highlightShape[1] = highlightShape[3] = highlightShape[highlightShape.length
- 1] = highlightShape[highlightShape.length - 3] = highlightY;
gc.fillPolygon(highlightShape);
gc.setForeground(tabOutlineColor);
gc.setAdvanced(gcAdvanced);
}
}

if (backgroundPattern != null) {
Expand All @@ -640,11 +656,6 @@ void drawSelectedTab(int itemIndex, GC gc, Rectangle bounds) {
if (foregroundPattern != null) {
foregroundPattern.dispose();
}

gc.setForeground(tabOutlineColor);
if (TAB_OUTLINE_WIDTH > 0) {
gc.drawPolyline(tabOutlinePoints);
}
}

void drawUnselectedTab(int itemIndex, GC gc, Rectangle bounds, int state) {
Expand Down
Loading