changeset 6090:e546ab623a97

RT-35374 [Monocle] LinuxInputTests: EGalax tests fail when running after DragTouchInAndOutAWindow Summary: There was a misunderstanding in MonocleWindow as to what xSet and ySet mean
author Daniel Blaukopf <daniel.blaukopf@oracle.com>
date Wed, 15 Jan 2014 20:52:36 +0200
parents 5b93cb591cb0
children c2f14b01f0d0
files modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleWindow.java
diffstat 1 files changed, 2 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleWindow.java	Wed Jan 15 20:24:42 2014 +0200
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleWindow.java	Wed Jan 15 20:52:36 2014 +0200
@@ -91,30 +91,14 @@
         //the window size w/o decorations
         boolean isContentSize = false;
 
-        //if true window position is also need to be update, else x&y are
-        //to be ignored
-        boolean  needToUpdatePosition = xSet || ySet;
-
         //if false, only move window
         boolean needResize = false;
 
-        if (!xSet && !ySet && w < 0 && h < 0 && cw < 0 && ch < 0) {
+        if (w < 0 && h < 0 && cw < 0 && ch < 0) {
             //nothing to do, return
             return;
         }
 
-        if (needToUpdatePosition) {
-            if (!xSet) {
-                //no explicit request to change x, get default
-                x = getX();
-            }
-
-            if (!ySet) {
-                //no explicit request to change y, get default
-                y = getY();
-            }
-        }
-
         if (w > 0) {
             //window width surpass window content width (cw)
             width = w;
@@ -159,8 +143,7 @@
         }
 
         //handle move if needed
-        if (needToUpdatePosition && 
-            (getX() != x || getY() != y)) {
+        if (getX() != x || getY() != y) {
             notifyMove(x, y);       
 
             windowHasBeenUpdated = true;