From 2861048105c56e5b7c8ee6175bfe20037c05b393 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <alexander.zvegintsev@oracle.com>
Date: Fri, 18 Oct 2013 20:35:36 +0400
Subject: [PATCH] 8026476: Choice does not get mouse events if it does not have
 enough place for popup menu

Reviewed-by: anthony, serb
---
 jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java b/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
index 561d9a6a1c4..9947cdaad0d 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
@@ -814,12 +814,12 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
                 x = screen.width - width;
             }
 
+            if (y + height > screen.height) {
+                y = global.y - height;
+            }
             if (y < 0) {
                 y = 0;
             }
-            else if (y + height > screen.height) {
-                y = screen.height - height;
-            }
             return new Rectangle(x, y, width, height);
         }