Changeset 7971 for code/branches

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.

Location:

code/branches/kicklib

Files:

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

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

code/branches/kicklib/src/libraries/core/GUIManager.cc

@@ -157 +157 @@
 #ifdef ORXONOX_OLD_CEGUI
         scriptModule_ = new LuaScriptModule(luaState_->getInternalLuaState());
+        luaState_->doString("ORXONOX_OLD_CEGUI = true");
 #else
         scriptModule_ = &LuaScriptModule::create(luaState_->getInternalLuaState());

code/branches/kicklib/src/libraries/core/GUIManager.h

@@ -120 +120 @@
         static void setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled); //tolua_export
 
-        static bool isCEGUIVersion7(void) { return CEGUIVERSION7; } // tolua_export
-
         static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
 
@@ -156 +154 @@
         CEGUI::OgreCEGUIRenderer*            guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
         CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider
-        static const bool                    CEGUIVERSION7 = false;
 #else
         CEGUI::OgreRenderer*                 guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
         CEGUI::OgreResourceProvider*         resourceProvider_; //!< CEGUI's resource provider
         CEGUI::OgreImageCodec*               imageCodec_;
-        static const bool                    CEGUIVERSION7 = true;
 #endif
         LuaState*                            luaState_;         //!< LuaState, access point to the Lua engine