Changeset 7971 for code/branches/kicklib/data

Timestamp:

Feb 26, 2011, 8:13:15 PM (14 years ago)

Author:

rgrieder

Message:

Fixed GUITools.lua for good: both CECGUI 0.6 and 0.7 seem to work. At least I haven't noticed any bogus behaviour in the Credits or in the Quest sheet.

File:

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

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

@@ -54 +54 @@
 
     local height = 0
-    if orxonox.GUIManager:isCEGUIVersion7() then
-        height = math.floor(CEGUI.PropertyHelper.stringToFloat(window:getProperty("VertExtent")) + frameHeight) + 1
-    else
+    if ORXONOX_OLD_CEGUI then
         local lines = window:getFont():getFormattedLineCount(window:getText(), formattedArea, CEGUI.WordWrapLeftAligned)
         height = lines * window:getFont():getLineSpacing() + frameHeight
+    else
+        height = math.floor(CEGUI.PropertyHelper:stringToFloat(window:getProperty("VertExtent")) + frameHeight) + 1
     end
     return height