Changeset 48:d853401b7307 in xplra

Timestamp:

02/16/13 09:44:59 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Added support for moving and resizing the message area

Location:

src/plugin/src/xplra

Files:

• MessageWindow.cc (modified) (2 diffs)
• MessageWindow.h (modified) (2 diffs)

src/plugin/src/xplra/MessageWindow.cc

@@ -42 +42 @@
 using hu::varadiistvan::xplcommon::Util;
 
+using std::min;
+using std::max;
+
 //------------------------------------------------------------------------------
 
@@ -159 +162 @@
 bool MessageWindow::handleMouseClick(int x, int y, XPLMMouseStatus mouse)
 {
-    Util::debug("hu.varadiistvan.xplra.MessageWindow.handleMouseClick: x=%d, y=%d, mouse=0x%04x\n",
-                x, y, mouse);
+    if (mouse==xplm_MouseDown) {
+        if (x <= (left + resizeArea) ) {
+            mouseMode = MOUSE_RESIZE_LEFT;
+        } else if (x > (right-resizeArea) ) {
+            mouseMode = MOUSE_RESIZE_RIGHT;
+        } else {
+            mouseMode = MOUSE_MOVE;
+        }
+        clickedX = x;
+        clickedY = y;
+    } else if (mouse==xplm_MouseDrag) {
+        int xDiff = x - clickedX;
+
+        if (mouseMode==MOUSE_MOVE) {
+            int newLeft = left + xDiff;
+            int newRight = right + xDiff;
+
+            int screenWidth = XPLMGetDatai(widthDataRef);
+            if (newLeft>=0 && newRight<screenWidth) {
+                left = newLeft;
+                right = newRight;
+            }
+
+            int yDiff = y - clickedY;
+            int newTop = top + yDiff;
+            int newBottom = bottom + yDiff;
+
+            int screenHeight = XPLMGetDatai(heightDataRef);
+            if (newTop<screenHeight && newBottom>=0) {
+                top = newTop;
+                bottom = newBottom;
+            }
+        } else if (mouseMode==MOUSE_RESIZE_LEFT) {
+            int newLeft = left + xDiff;
+            if (newLeft>=0 && (right-newLeft)>=minimalWidth) {
+                left = newLeft;
+            }
+        } else if (mouseMode==MOUSE_RESIZE_RIGHT) {
+            int newRight = right + xDiff;
+            int screenWidth = XPLMGetDatai(widthDataRef);
+            if (newRight<screenWidth && (newRight-left)>=minimalWidth) {
+                right = newRight;
+            }
+        }
+
+        XPLMSetWindowGeometry(windowID, left, top, right, bottom);
+
+        clickedX = x;
+        clickedY = y;
+    }
+
     return true;
 }

src/plugin/src/xplra/MessageWindow.h

@@ -68 +68 @@
                                         XPLMMouseStatus mouse, void* refCon);
 
+
+    /**
+     * The minimal width of the message area.
+     */
+    static const int minimalWidth = 150;
+
+    /**
+     * The size of the resize sensitivity area.
+     */
+    static const int resizeArea = 50;
+
 private:
     /**
@@ -119 +130 @@
      */
     float hideTime;
+
+    /**
+     * The mouse mode
+     */
+    enum {
+        // Move the message area
+        MOUSE_MOVE,
+
+        // Resize the message area from the left
+        MOUSE_RESIZE_LEFT,
+
+        // Resize the message area from the right.
+        MOUSE_RESIZE_RIGHT
+    } mouseMode;
+
+    /**
+     * The X-coordinate where the window was clicked.
+     */
+    int clickedX;
+
+    /**
+     * The Y-coordinate where the window was clicked.
+     */
+    int clickedY;
 
     /**