Changeset 50:d650ff7422a5 in xplra for src/plugin/src/xplra/MessageWindow.cc

Timestamp:

02/16/13 10:13:44 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The font size is now taken into account and the maximal message length is considered

File:

• src/plugin/src/xplra/MessageWindow.cc (modified) (7 diffs)

src/plugin/src/xplra/MessageWindow.cc

@@ -42 +42 @@
 using hu::varadiistvan::xplcommon::Util;
 
+using std::string;
 using std::min;
 using std::max;
@@ -76 +77 @@
 
 MessageWindow::MessageWindow() :
+    maxMessageLength(0),
     showForced(false),
     hideTime(0.0),
@@ -89 +91 @@
     heightDataRef = XPLMFindDataRef("sim/graphics/view/window_height");
 
+    int digitsOnly = 0;
+    XPLMGetFontDimensions(xplmFont_Basic, &fontWidth, &fontHeight, &digitsOnly);
+
+    Util::debug("hu.varadiistvan.xplra.MessageWindow: fontWidth=%d, fontHeight=%d\n",
+                fontWidth, fontHeight);
+
     resetLocation();
 
@@ -148 +156 @@
         XPLMDrawTranslucentDarkBox(left, top, right, bottom);
         if (hideTime!=0.0) {
-            XPLMDrawString(colour, left + 25, top - 15,
-                           const_cast<char*>(displayedMessage.c_str()), 0,
+
+            string dm(displayedMessage, 0, maxMessageLength);
+
+            XPLMDrawString(colour,
+                           left + horizontalMarginSize,
+                           bottom + verticalMarginSize + baseLineSize,
+                           const_cast<char*>(dm.c_str()), 0,
                            xplmFont_Basic);
         }
@@ -208 +221 @@
             if (newLeft>=0 && (right-newLeft)>=minimalWidth) {
                 left = newLeft;
+                recalculateMaxMessageLength();
             }
         } else if (mouseMode==MOUSE_RESIZE_RIGHT) {
@@ -214 +228 @@
             if (newRight<screenWidth && (newRight-left)>=minimalWidth) {
                 right = newRight;
+                recalculateMaxMessageLength();
             }
         }
 
         XPLMSetWindowGeometry(windowID, left, top, right, bottom);
-
-        // clickedX = x;
-        // clickedY = y;
     }
 
@@ -267 +279 @@
     //             screenWidth, screenHeight);
 
-    left = 50; right = screenWidth - left;
-    top = screenHeight * 9 / 10; bottom = top - 25;
+    left = 50;
+    right = screenWidth - left;
+
+    top = screenHeight * 9 / 10;
+    bottom = top - fontHeight - 2*verticalMarginSize;
+
+    recalculateMaxMessageLength();
+}
+
+//------------------------------------------------------------------------------
+
+void MessageWindow::recalculateMaxMessageLength()
+{
+    maxMessageLength = (right + 1 - left) - 2 * horizontalMarginSize;
+    maxMessageLength /= fontWidth;
 }