diff options
| author | Felipe Heidrich | 2010-10-21 15:54:32 +0000 |
|---|---|---|
| committer | Felipe Heidrich | 2010-10-21 15:54:32 +0000 |
| commit | 8ee67e6f8cf3388d2b8a853341c6cdcc23726672 (patch) | |
| tree | 3e080d2712b55baf5d09b4c161bf95ab12679ef3 /bundles/org.eclipse.swt/Eclipse SWT/emulated | |
| parent | 550e8a8e9bc83f6157c95ef4f9d89d7b16a7ca9e (diff) | |
| download | eclipse.platform.swt-8ee67e6f8cf3388d2b8a853341c6cdcc23726672.tar.gz eclipse.platform.swt-8ee67e6f8cf3388d2b8a853341c6cdcc23726672.tar.xz eclipse.platform.swt-8ee67e6f8cf3388d2b8a853341c6cdcc23726672.zip | |
Bug 228376 - Owner draw: measure does not contain 'is selected' information
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/emulated')
2 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TableItem.java index abdf2bccaa..23afd14881 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TableItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TableItem.java @@ -924,6 +924,7 @@ int getPreferredWidth (int columnIndex) { event.y = parent.getItemY (this); event.width = width; event.height = parent.itemHeight; + event.detail = isSelected () ? SWT.SELECTED : 0; parent.sendEvent (SWT.MeasureItem, event); if (parent.itemHeight != event.height) { parent.customHeightSet = true; @@ -1083,6 +1084,7 @@ boolean paint (GC gc, TableColumn column, boolean backgroundOnly) { Pattern oldForegroundPattern = gc.getForegroundPattern (); int oldInterpolation = gc.getInterpolation (); int oldTextAntialias = gc.getTextAntialias (); + boolean isSelected = isSelected (); if (parent.hooks (SWT.MeasureItem)) { int contentWidth = getContentWidth (columnIndex); @@ -1096,6 +1098,7 @@ boolean paint (GC gc, TableColumn column, boolean backgroundOnly) { event.y = parent.getItemY (this); event.width = contentWidth; event.height = parent.itemHeight; + event.detail = isSelected ? SWT.SELECTED : 0; parent.sendEvent (SWT.MeasureItem, event); event.gc = null; if (gc.isDisposed ()) return false; @@ -1153,7 +1156,6 @@ boolean paint (GC gc, TableColumn column, boolean backgroundOnly) { parent.drawBackground (gc, cellBounds.x, cellBounds.y, fillWidth, cellBounds.height, 0, 0); } - boolean isSelected = isSelected (); boolean isFocusItem = parent.focusItem == this && parent.isFocusControl (); boolean drawBackground = true; boolean drawForeground = true; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TreeItem.java index 966b66986e..6f9b10b180 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TreeItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/treetable/org/eclipse/swt/widgets/TreeItem.java @@ -1467,6 +1467,7 @@ int getPreferredWidth (int columnIndex) { event.y = parent.getItemY (this); event.width = width; event.height = parent.itemHeight; + event.detail = isSelected () ? SWT.SELECTED : 0; parent.sendEvent (SWT.MeasureItem, event); if (parent.itemHeight != event.height) { parent.customHeightSet = true; @@ -1685,6 +1686,7 @@ boolean paint (GC gc, TreeColumn column, boolean backgroundOnly) { int[] oldLineDash = gc.getLineDash (); int oldLineWidth = gc.getLineWidth (); int oldTextAntialias = gc.getTextAntialias (); + boolean isSelected = isSelected (); if (parent.hooks (SWT.MeasureItem)) { int contentWidth = getContentWidth (columnIndex); @@ -1698,6 +1700,7 @@ boolean paint (GC gc, TreeColumn column, boolean backgroundOnly) { event.y = parent.getItemY (this); event.width = contentWidth; event.height = parent.itemHeight; + event.detail = isSelected ? SWT.SELECTED : 0; parent.sendEvent (SWT.MeasureItem, event); event.gc = null; if (gc.isDisposed ()) return false; @@ -1757,7 +1760,6 @@ boolean paint (GC gc, TreeColumn column, boolean backgroundOnly) { parent.drawBackground (gc, cellBounds.x, cellBounds.y, fillWidth, cellBounds.height, 0, 0); } - boolean isSelected = isSelected (); boolean isFocusItem = parent.focusItem == this && parent.isFocusControl (); boolean drawBackground = true; boolean drawForeground = true; |