diff options
| author | Arun Thondapu | 2013-02-07 10:03:37 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2013-02-07 10:03:37 +0000 |
| commit | fa723f28f2f267e5615bfd54cf2b83f638a4dc96 (patch) | |
| tree | eb5bc0f638bc10c2ab2cc7e0ad036770693a5eb7 /bundles | |
| parent | f657532d209472f8fafec3d965f8dc7f35b5af06 (diff) | |
| download | eclipse.platform.swt-fa723f28f2f267e5615bfd54cf2b83f638a4dc96.tar.gz eclipse.platform.swt-fa723f28f2f267e5615bfd54cf2b83f638a4dc96.tar.xz eclipse.platform.swt-fa723f28f2f267e5615bfd54cf2b83f638a4dc96.zip | |
Bug 399543 ColorDialog ignores existing choice of color when GTK version
is >= 3.4.0
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java index 4f3970d499..70da8c6aff 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java @@ -167,7 +167,12 @@ public RGB open () { } OS.gtk_color_selection_set_has_palette (colorsel, true); } else { - OS.gtk_color_chooser_set_use_alpha (handle, false); + if (rgb != null) { + rgba.red = (double) rgb.red / 255; + rgba.green = (double) rgb.green / 255; + rgba.blue = (double) rgb.blue / 255; + } + OS.gtk_color_chooser_set_use_alpha (handle, false); OS.gtk_color_chooser_set_rgba (handle, rgba); } @@ -236,7 +241,7 @@ public RGB open () { green = (color.green >> 8) & 0xFF; blue = (color.blue >> 8) & 0xFF; } - rgb = new RGB (red, green, blue); + rgb = new RGB (red, green, blue); } long /*int*/ settings = OS.gtk_settings_get_default (); if (settings != 0) { |