commit 0295848a087c460af86ad5f95cfaf26f99bf36f7
author Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Wed Oct 19 08:05:56 2016 +0300
committer Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Wed Oct 19 08:05:56 2016 +0300
tree 7c465e646b27f5f48d419e4f20266dde60b44185
parent d121d72b9ea0848e73a440e27aa21527a1a30ff8

JRE-50 GUI rendering issue ("cannot load system cursor: CopyDrop.32x32" exception)

Replaced incorrect cursor size with preferred one

src/solaris/classes/sun/awt/X11/XCustomCursor.java

diff --git a/src/solaris/classes/sun/awt/X11/XCustomCursor.java b/src/solaris/classes/sun/awt/X11/XCustomCursor.java
index 0135e25..cb265c7 100644
--- a/src/solaris/classes/sun/awt/X11/XCustomCursor.java
+++ b/src/solaris/classes/sun/awt/X11/XCustomCursor.java
@@ -59,9 +59,18 @@
             long display = XToolkit.getDisplay();
             long root_window = XlibWrapper.RootWindow(display,
                     XlibWrapper.DefaultScreen(display));
+            preferredWidth = Math.abs(preferredWidth);
+            preferredHeight = Math.abs(preferredHeight);
 
-            XlibWrapper.XQueryBestCursor(display,root_window, Math.abs(preferredWidth),Math.abs(preferredHeight),XlibWrapper.larg1,XlibWrapper.larg2);
-            d = new Dimension(XlibWrapper.unsafe.getInt(XlibWrapper.larg1),XlibWrapper.unsafe.getInt(XlibWrapper.larg2));
+            XlibWrapper.XQueryBestCursor(display, root_window,
+                    preferredWidth, preferredHeight,
+                    XlibWrapper.larg1, XlibWrapper.larg2);
+
+            int cWidth = XlibWrapper.unsafe.getInt(XlibWrapper.larg1);
+            int cHeight = XlibWrapper.unsafe.getInt(XlibWrapper.larg2);
+            if (cWidth == 0) cWidth = preferredWidth;
+            if (cHeight == 0) cHeight = preferredHeight;
+            d = new Dimension(cWidth, cHeight);
         }
         finally {
             XToolkit.awtUnlock();