diff options
| author | Markus Keller <markus_keller@ch.ibm.com> | 2012-10-18 14:59:35 +0200 |
|---|---|---|
| committer | Markus Keller <markus_keller@ch.ibm.com> | 2012-10-18 14:59:35 +0200 |
| commit | de2297113fcb0174b02c429f9d73e7ee7a1eccda (patch) | |
| tree | 55182b48a03843465fbfb35e93d45769c7cd7475 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java | |
| parent | 5673881707cbfd963bc0ed943607494119f5edb9 (diff) | |
| download | eclipse.platform.swt-de2297113fcb0174b02c429f9d73e7ee7a1eccda.tar.gz eclipse.platform.swt-de2297113fcb0174b02c429f9d73e7ee7a1eccda.tar.xz eclipse.platform.swt-de2297113fcb0174b02c429f9d73e7ee7a1eccda.zip | |
Bug 361373: StyledCellLabelProvider on Ubuntu: Wrong text color for selected, unfocused table and tree items
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java index 5cbb6dc3af..510e85de66 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java @@ -1558,20 +1558,15 @@ public void setData (String key, Object value) { void setForegroundColor (long /*int*/ handle, GdkColor color) { long /*int*/ style = OS.gtk_widget_get_modifier_style (handle); OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color); - OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color); OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color); int flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL); flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG; OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_NORMAL, flags); - flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE); - flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG; - OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags); flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT); flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG; OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_PRELIGHT, flags); OS.gtk_rc_style_set_text (style, OS.GTK_STATE_NORMAL, color); - OS.gtk_rc_style_set_text (style, OS.GTK_STATE_ACTIVE, color); OS.gtk_rc_style_set_text (style, OS.GTK_STATE_PRELIGHT, color); flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL); flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT; @@ -1579,9 +1574,6 @@ void setForegroundColor (long /*int*/ handle, GdkColor color) { flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT); flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT; OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_PRELIGHT, flags); - flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE); - flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT; - OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags); modifyStyle (handle, style); } |