Changeset 49:2f52c296803c in xplra

Timestamp:

02/16/13 09:52:01 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Made the moving and resizing better looking

Location:

src/plugin/src/xplra

Files:

• MessageWindow.cc (modified) (5 diffs)
• MessageWindow.h (modified) (1 diff)

src/plugin/src/xplra/MessageWindow.cc

@@ -78 +78 @@
     showForced(false),
     hideTime(0.0),
+    clickedX(-1),
+    clickedY(-1),
+    clickedLeft(-1),
+    clickedTop(-1),
+    clickedRight(-1),
+    clickedBottom(-1),
     duration(0.0)
 {
@@ -172 +178 @@
         clickedX = x;
         clickedY = y;
+        clickedLeft = left;
+        clickedTop = top;
+        clickedRight = right;
+        clickedBottom = bottom;
     } else if (mouse==xplm_MouseDrag) {
         int xDiff = x - clickedX;
 
         if (mouseMode==MOUSE_MOVE) {
-            int newLeft = left + xDiff;
-            int newRight = right + xDiff;
+            int newLeft = clickedLeft + xDiff;
+            int newRight = clickedRight + xDiff;
 
             int screenWidth = XPLMGetDatai(widthDataRef);
@@ -186 +196 @@
 
             int yDiff = y - clickedY;
-            int newTop = top + yDiff;
-            int newBottom = bottom + yDiff;
+            int newTop = clickedTop + yDiff;
+            int newBottom = clickedBottom + yDiff;
 
             int screenHeight = XPLMGetDatai(heightDataRef);
@@ -195 +205 @@
             }
         } else if (mouseMode==MOUSE_RESIZE_LEFT) {
-            int newLeft = left + xDiff;
+            int newLeft = clickedLeft + xDiff;
             if (newLeft>=0 && (right-newLeft)>=minimalWidth) {
                 left = newLeft;
             }
         } else if (mouseMode==MOUSE_RESIZE_RIGHT) {
-            int newRight = right + xDiff;
+            int newRight = clickedRight + xDiff;
             int screenWidth = XPLMGetDatai(widthDataRef);
             if (newRight<screenWidth && (newRight-left)>=minimalWidth) {
@@ -209 +219 @@
         XPLMSetWindowGeometry(windowID, left, top, right, bottom);
 
-        clickedX = x;
-        clickedY = y;
+        // clickedX = x;
+        // clickedY = y;
     }
 

src/plugin/src/xplra/MessageWindow.h

@@ -156 +156 @@
 
     /**
+     * The left coordinate of the window when it was clicked.
+     */
+    int clickedLeft;
+
+    /**
+     * The top coordinate of the window when it was clicked.
+     */
+    int clickedTop;
+
+    /**
+     * The right coordinate of the window when it was clicked.
+     */
+    int clickedRight;
+
+    /**
+     * The bottom coordinate of the window when it was clicked.
+     */
+    int clickedBottom;
+
+    /**
      * The mutex protecting some of the data structures that are used
      * from both the simulator loop and the server thread.