changeset 13497:fbed78affeea

8214109: XToolkit is not correctly displayed color on 16-bit high color setting Reviewed-by: serb, prr
author dmarkov
date Tue, 26 Feb 2019 18:12:06 +0000
parents 0ff0f14d5346
children 94230f2a671e
files src/solaris/classes/sun/awt/X11/XWindow.java
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/classes/sun/awt/X11/XWindow.java	Thu Jan 10 16:38:02 2019 +0530
+++ b/src/solaris/classes/sun/awt/X11/XWindow.java	Tue Feb 26 18:12:06 2019 +0000
@@ -446,14 +446,7 @@
             if (!doEraseBackground()) {
                 return;
             }
-            // 6304250: XAWT: Items in choice show a blue border on OpenGL + Solaris10 when background color is set
-            // Note: When OGL is enabled, surfaceData.pixelFor() will not
-            // return a pixel value appropriate for passing to
-            // XSetWindowBackground().  Therefore, we will use the ColorModel
-            // for this component in order to calculate a pixel value from
-            // the given RGB value.
-            ColorModel cm = getColorModel();
-            int pixel = PixelConverter.instance.rgbToPixel(c.getRGB(), cm);
+            int pixel = surfaceData.pixelFor(c.getRGB());
             XlibWrapper.XSetWindowBackground(XToolkit.getDisplay(), getContentWindow(), pixel);
             XlibWrapper.XClearWindow(XToolkit.getDisplay(), getContentWindow());
         }