Changeset 10292 for code/trunk

Timestamp:

Mar 1, 2015, 3:27:01 PM (9 years ago)

Author:

landauf

Message:

fixed text size in HUD (marker which shows the enemy's name). the configured size was not used and it was completely distorted if the window was resized. now both works.

Location:

code/trunk

Files:

• data/overlays/HUD.oxo (modified) (1 diff)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (4 diffs)

code/trunk/data/overlays/HUD.oxo

@@ -61 +61 @@
    correctAspect = true
    font          = "Monofur"
-   textSize      = 0.05
+   textSize      = 0.02
    navMarkerSize = 0.03
    aimMarkerSize = 0.02

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -103 +103 @@
      correctaspect = true
      font          = "Monofur"
-     textsize      = 0.05
+     textsize      = 0.02
      navMarkerSize = 0.03
      aimMarkerSize = 0.02

code/trunk/data/overlays/HUDTemplatesFPS.oxo

@@ -46 +46 @@
      correctaspect = true
      font          = "Monofur"
-     textsize      = 0.05
+     textsize      = 0.02
      navMarkerSize = 0.03
      aimMarkerSize = 0.04

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -135 +135 @@
         {
             if (it->second.text_ != NULL)
-            it->second.text_->setFontName(this->fontName_);
+                it->second.text_->setFontName(this->fontName_);
         }
     }
@@ -155 +155 @@
         {
             if (it->second.text_)
-            it->second.text_->setCharHeight(size);
+                it->second.text_->setCharHeight(size);
         }
     }
@@ -541 +541 @@
                 it->second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
             if (it->second.text_ != NULL)
-                it->second.text_->setCharHeight(it->second.text_->getCharHeight() * yScale);
+                it->second.text_->setCharHeight(this->textSize_ * yScale);
             if (it->second.target_ != NULL)
                 it->second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
@@ -597 +597 @@
                 .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberString()));
         text->setFontName(this->fontName_);
-        text->setCharHeight(text->getCharHeight() * yScale);
+        text->setCharHeight(this->textSize_ * yScale);
         text->setColour(object->getRadarObjectColour());