Debugging: Draw background with offset

Author: Christopher-Hermann

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java

@@ -85,8 +85,8 @@ public void handleEvent(Event event) {
 				measureItem(event);
 				break;
 			case SWT.EraseItem:
-				// Remove foreground/background/selected to draw custom selection
-				event.detail &= ~(SWT.FOREGROUND | SWT.BACKGROUND | SWT.SELECTED);
+				ColumnViewerSelectionColorListener.drawSelection(event, event.display);
+				event.detail&= ~SWT.FOREGROUND;
 				break;
 			case SWT.PaintItem:
 				performPaint(event);
@@ -152,7 +152,7 @@ private void performPaint(Event event) {
 
 		if (isSelected) {
 			// Draw custom selection using shared utility
-			ColumnViewerSelectionColorListener.drawSelection(event, fSharedLayout.getDevice());
+//			ColumnViewerSelectionColorListener.drawSelection(event, fSharedLayout.getDevice());
 		} else if (!isSelected) {
 			Color foreground= item.getForeground(index);
 			gc.setForeground(foreground);

bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColumnViewerSelectionColorListener.java

@@ -181,11 +181,20 @@ public static void drawSelection(Event event, org.eclipse.swt.graphics.Device de
 			width = scrollable.getClientArea().width;
 		}
 
+		int x = 0;
+		if (width > 50) {
+			x = 50;
+		}
+
 		// Fill selection rectangle
-		gc.fillRectangle(0, event.y, width, event.height);
+		// Use event.x and event.width to respect the bounds provided by SWT,
+		// which on some platforms (like GTK/Linux) excludes the image area
+		gc.fillRectangle(x, event.y, width, event.height);
 
 		// Remove SELECTED and BACKGROUND flags to prevent native drawing from overwriting our custom colors
-		event.detail &= ~(SWT.SELECTED | SWT.BACKGROUND);
+		// Note: On Linux/GTK, we must keep the SELECTED flag so that icons are still drawn
+		// We only remove BACKGROUND to prevent the native background from overwriting our custom colors
+		event.detail &= ~(SWT.SELECTED);
 	}
 
 	/**
@@ -213,15 +222,15 @@ private void drawCustomSelection(Event event) {
 	 */
 	public static Color getSelectionColor(String key, org.eclipse.swt.graphics.Device device) {
 		ColorRegistry registry = JFaceResources.getColorRegistry();
-		
+
 		// Check if workbench has registered themed colors
 		if (registry.hasValueFor(key)) {
 			return registry.get(key);
 		}
-		
+
 		// Fallback to system colors when workbench is not available
 		RGB systemColor;
-		
+
 		switch (key) {
 			case COLOR_SELECTION_BG_FOCUS:
 				// Use system highlight color (title bar background) for focused selection
@@ -244,7 +253,7 @@ public static Color getSelectionColor(String key, org.eclipse.swt.graphics.Devic
 				systemColor = device.getSystemColor(SWT.COLOR_LIST_SELECTION).getRGB();
 				break;
 		}
-		
+
 		// Register the fallback color so we don't recompute it every time
 		registry.put(key, systemColor);
 		return registry.get(key);