Changeset 7965 for code/branches/kicklib/data/gui

Timestamp:

Feb 26, 2011, 11:06:36 AM (14 years ago)

Author:

dafrick

Message:

getStaticTextWindowHeight() working again for CEGUI < 0.7

File:

• code/branches/kicklib/data/gui/scripts/GUITools.lua (modified) (1 diff)

code/branches/kicklib/data/gui/scripts/GUITools.lua

@@ -46 +46 @@
 end
 
-function getStaticTextArea(static_text)
-    local lookAndFeel = CEGUI.WidgetLookManager:getSingleton():getWidgetLook(static_text:getLookNFeel())
-
-    return lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(static_text)
-end
-
 function getStaticTextWindowHeight(window)
     -- Get the area the text is formatted and drawn into.
-    local formattedArea = getStaticTextArea(window)
+    local lookAndFeel = CEGUI.WidgetLookManager:getSingleton():getWidgetLook(window:getLookNFeel())
+    local formattedArea = lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window)
     -- Calculate the pixel height of the frame by subtracting the height of the area above from the total height of the window.
     local frameHeight = window:getUnclippedOuterRect():getHeight() - formattedArea:getHeight()
 
-    local height = math.floor(CEGUI.PropertyHelper.stringToFloat(window:getProperty("VertExtent")) + frameHeight) + 1
+    local height = 0
+    if orxonox.GUIManager:isCEGUIVersion7() then
+        height = math.floor(CEGUI.PropertyHelper.stringToFloat(window:getProperty("VertExtent")) + frameHeight) + 1
+    else
+        local lines = window:getFont():getFormattedLineCount(window:getText(), formattedArea, CEGUI.WordWrapLeftAligned)
+        height = lines * window:getFont():getLineSpacing() + frameHeight
+    end
     return height
 end