Changeset 11809

Timestamp:

Feb 24, 2018, 4:58:39 PM (6 years ago)

Author:

landauf

Message:

added work around for a bug in cegui 0.8 (the cegui lua scripts expect a "Font*" pointer to call getTextExtent(), but cegui 0.8 only returns "const Font*")

Location:

code/branches/cegui0.8_ogre1.9

Files:

• data/gui/scripts/GUITools.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/core/GUIManager.h (modified) (1 diff)

code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUITools.lua

@@ -31 +31 @@
 
     local lookAndFeel = CEGUI.WidgetLookManager:getSingleton():getWidgetLook(window:getLookNFeel())
-    local height = window:getFont():getLineSpacing() + window:getUnclippedOuterRect():get():getHeight() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getHeight()
-    local width =  window:getFont():getTextExtent(window:getText()) + window:getUnclippedOuterRect():get():getWidth() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getWidth()
+
+    local lineSpacing = window:getFont():getLineSpacing()
+    --local textExtent = window:getFont():getTextExtent(window:getText())
+    local textExtent = orxonox.GUIManager:getFontTextExtent(window:getFont(), window:getText()) -- workaround for bug in cegui lua scripts
+    
+    local height = lineSpacing + window:getUnclippedOuterRect():get():getHeight() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getHeight()
+    local width  = textExtent  + window:getUnclippedOuterRect():get():getWidth()  - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getWidth()
 
     table.insert(size, height)

code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc

@@ -972 +972 @@
     }
 
+    /*static*/ float GUIManager::getFontTextExtent(const CEGUI::Font* font, const std::string& text, float x_scale)
+    {
+        return font->getTextExtent(text, x_scale);
+    }
 }

code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.h

@@ -143 +143 @@
         static void setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled); // tolua_export
         static void addFontHelper(const std::string& name, int size, const std::string& fontName); // tolua_export
+        static float getFontTextExtent(const CEGUI::Font* font, const std::string& text, float x_scale = 1.0f); // tolua_export
 
         static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export