Attachment 204868 Details for Bug 351814 – Proposed patch for v14_Maintenance branch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch for v14_Maintenance branch

Bug-351814-v14.patch (text/plain), 2.71 KB, created by Ivan Furnadjiev

on 2011-10-10 07:14:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-10-10 07:14:07 EDT

Size: 2.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.jface
>Index: src/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.jface/src/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.java,v
>retrieving revision 1.15
>diff -u -r1.15 FocusCellOwnerDrawHighlighter.java
>--- src/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.java	18 Aug 2010 08:07:53 -0000	1.15
>+++ src/org/eclipse/jface/viewers/FocusCellOwnerDrawHighlighter.java	10 Oct 2011 10:18:39 -0000
>@@ -100,26 +100,20 @@
> //		GC gc = event.gc;
> //		gc.setBackground(cell.getViewerRow().getBackground(
> //				cell.getColumnIndex()));
>-	  Color tableBackground = cell.getControl().getBackground();
>-	  Color cellBackground
>-	    = cell.getViewerRow().getBackground( cell.getColumnIndex() );
>-	  if( !cellBackground.equals( tableBackground ) ) {
>-	    cell.setBackground( cellBackground );
>-	  } else {
>-	    cell.setBackground( null );
>-	  }
> //		gc.setForeground(cell.getViewerRow().getForeground(
> //				cell.getColumnIndex()));
>-	  Color tableForeground = cell.getControl().getForeground();
>-	  Color cellForeground
>-	    = cell.getViewerRow().getForeground( cell.getColumnIndex() );
>-	  if( !cellForeground.equals( tableForeground ) ) {
>-	    cell.setForeground( cellForeground );
>-	  } else {
>-	    cell.setForeground( null );
>-	  }
> //		gc.fillRectangle(cell.getBounds());
> //		event.detail &= ~SWT.SELECTED;
>+	  Color cellBackground = null;
>+	  Color cellForeground = null;
>+	  CellLabelProvider labelProvider = viewer.getLabelProvider( cell.getColumnIndex() );
>+	  if( labelProvider instanceof ColumnLabelProvider ) {
>+	    ColumnLabelProvider columnLabelProvider = ( ColumnLabelProvider )labelProvider;
>+        cellBackground = columnLabelProvider.getBackground( cell.getElement() );
>+        cellForeground = columnLabelProvider.getForeground( cell.getElement() );
>+	  }
>+	  cell.setBackground( cellBackground );
>+	  cell.setForeground( cellForeground );
> 	}
> 
>     private void hookListener(final ColumnViewer viewer) {
>@@ -306,8 +300,12 @@
> //					true);
> //		}
>         if( oldCell != null ) {
>-          oldCell.setBackground( null );
>-          oldCell.setForeground( null );
>+          if(    newCell == null
>+              || !isItemSelected( oldCell.getItem() )
>+              || newCell.getColumnIndex() != oldCell.getColumnIndex() )
>+          {
>+            removeSelectionInformation( null, oldCell );
>+          }
> // [if] Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=264226
> // When selected item is deleted, the oldCell item and element are out of sync
> //          viewer.updateItem( oldCell.getItem(), oldCell.getElement() );

Actions: View | Diff

Attachments on bug 351814: 204868