Changeset 47:411a69092798 in xplra

Timestamp:

02/16/13 09:24:42 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added a menu option to reset the message area

Location:

src/plugin/src/xplra

Files:

• Menu.cc (modified) (2 diffs)
• Menu.h (modified) (1 diff)
• MessageWindow.cc (modified) (3 diffs)
• MessageWindow.h (modified) (2 diffs)

src/plugin/src/xplra/Menu.cc

@@ -39 +39 @@
 //------------------------------------------------------------------------------
 
+void* const Menu::showMessageAreaRef = reinterpret_cast<void*>(1);
+
+void* const Menu::resetMessageAreaRef = reinterpret_cast<void*>(2);
+
+//------------------------------------------------------------------------------
+
 void Menu::menuHandlerCallback(void* menuRef, void* itemRef)
 {
@@ -58 +64 @@
                             &menuHandlerCallback, this);
     showMessageAreaIndex = XPLMAppendMenuItem(menuID, "Show message area",
-                                              0, 1);
+                                              showMessageAreaRef, 1);
     XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Unchecked);
+    XPLMAppendMenuItem(menuID, "Reset message area", resetMessageAreaRef, 1);
 }
 
 //------------------------------------------------------------------------------
 
-void Menu::handleMenu(void* /*itemRef*/)
+void Menu::handleMenu(void* itemRef)
 {
-    XPLMMenuCheck checked = xplm_Menu_NoCheck;
-    XPLMCheckMenuItemState(menuID, showMessageAreaIndex, &checked);
-    if (checked==xplm_Menu_Unchecked) {
-        XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Checked);
-        messageWindow.show();
-    } else if (checked==xplm_Menu_Checked) {
-        XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Unchecked);
-        messageWindow.hide();
+    if (itemRef==showMessageAreaRef) {
+        XPLMMenuCheck checked = xplm_Menu_NoCheck;
+        XPLMCheckMenuItemState(menuID, showMessageAreaIndex, &checked);
+        if (checked==xplm_Menu_Unchecked) {
+            XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Checked);
+            messageWindow.show();
+        } else if (checked==xplm_Menu_Checked) {
+            XPLMCheckMenuItem(menuID, showMessageAreaIndex, xplm_Menu_Unchecked);
+            messageWindow.hide();
+        }
+    } else if (itemRef==resetMessageAreaRef) {
+        messageWindow.reset();
     }
 }

src/plugin/src/xplra/Menu.h

@@ -55 +55 @@
 
     /**
+     * Item reference for the show message area menu item.
+     */
+    static void* const showMessageAreaRef;
+
+    /**
+     * Item reference for the show message area menu item.
+     */
+    static void* const resetMessageAreaRef;
+
+    /**
      * Reference to the message window.
      */

src/plugin/src/xplra/MessageWindow.cc

@@ -80 +80 @@
     heightDataRef = XPLMFindDataRef("sim/graphics/view/window_height");
 
-    int screenWidth = XPLMGetDatai(widthDataRef);
-    int screenHeight = XPLMGetDatai(heightDataRef);
-
-    // Util::debug("hu.varadiistvan.xplra.MessageWindow: screenWidth=%d, screenHeight=%d\n",
-    //             screenWidth, screenHeight);
-
-    left = 50; right = screenWidth - left;
-    top = screenHeight * 9 / 10; bottom = top - 25;
+    resetLocation();
 
     windowID = XPLMCreateWindow(left, top, right, bottom, 0,
@@ -116 +109 @@
 {
     showForced = false;
+}
+
+//------------------------------------------------------------------------------
+
+void MessageWindow::reset()
+{
+    resetLocation();
+    XPLMSetWindowGeometry(windowID, left, top, right, bottom);
 }
 
@@ -196 +197 @@
 //------------------------------------------------------------------------------
 
+void MessageWindow::resetLocation()
+{
+    int screenWidth = XPLMGetDatai(widthDataRef);
+    int screenHeight = XPLMGetDatai(heightDataRef);
+
+    // Util::debug("hu.varadiistvan.xplra.MessageWindow: screenWidth=%d, screenHeight=%d\n",
+    //             screenWidth, screenHeight);
+
+    left = 50; right = screenWidth - left;
+    top = screenHeight * 9 / 10; bottom = top - 25;
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

src/plugin/src/xplra/MessageWindow.h

@@ -161 +161 @@
     void hide();
 
+    /**
+     * Reset the location of the message window.
+     */
+    void reset();
+
 private:
     /**
@@ -192 +197 @@
      */
     void setNewMessage(const std::string& msg, float d);
+
+    /**
+     * Reset the location of the message window.
+     */
+    void resetLocation();
 
     friend class MessageRequest;