From c819bc8751ae834fddee4cf1adea32566182616f Mon Sep 17 00:00:00 2001 From: Shahzaib Ibrahim Date: Mon, 15 Dec 2025 13:46:46 +0100 Subject: [PATCH] Adjust selection bounds for CTabRenderring Selected tabs highlight look slightly off and more noticeable when zoom is not 100%. These adjusted value shows no gaps from top and better aligned highlights for tabs (Theme is enabled) --- .../renderers/swt/CTabRendering.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java index ddbdc346105..a474ef69a7e 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java @@ -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; @@ -626,12 +627,22 @@ void drawSelectedTab(int itemIndex, GC gc, Rectangle bounds) { 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 = 1 + (superimposeKeylineOutline && highlightOnTop ? OUTER_KEYLINE_WIDTH : 0); + + if (cornerSize == SQUARE_CORNER || highlightOnTop == onBottom) { + int verticalOffset = highlightOnTop ? 0 : outlineBoundsForOutline.height - (highlightHeight); + gc.setAdvanced(false); + gc.fillRectangle(outlineBoundsForOutline.x, outlineBoundsForOutline.y + verticalOffset, + outlineBoundsForOutline.width, highlightHeight + 1); + } else { + 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.setAdvanced(false); + gc.fillPolygon(highlightShape); + } } if (backgroundPattern != null) {