Changeset 7971
- Timestamp:
- Feb 26, 2011, 8:13:15 PM (14 years ago)
- Location:
- code/branches/kicklib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib/data/gui/scripts/GUITools.lua
r7965 r7971 54 54 55 55 local height = 0 56 if orxonox.GUIManager:isCEGUIVersion7() then 57 height = math.floor(CEGUI.PropertyHelper.stringToFloat(window:getProperty("VertExtent")) + frameHeight) + 1 58 else 56 if ORXONOX_OLD_CEGUI then 59 57 local lines = window:getFont():getFormattedLineCount(window:getText(), formattedArea, CEGUI.WordWrapLeftAligned) 60 58 height = lines * window:getFont():getLineSpacing() + frameHeight 59 else 60 height = math.floor(CEGUI.PropertyHelper:stringToFloat(window:getProperty("VertExtent")) + frameHeight) + 1 61 61 end 62 62 return height -
code/branches/kicklib/src/libraries/core/GUIManager.cc
r7968 r7971 157 157 #ifdef ORXONOX_OLD_CEGUI 158 158 scriptModule_ = new LuaScriptModule(luaState_->getInternalLuaState()); 159 luaState_->doString("ORXONOX_OLD_CEGUI = true"); 159 160 #else 160 161 scriptModule_ = &LuaScriptModule::create(luaState_->getInternalLuaState()); -
code/branches/kicklib/src/libraries/core/GUIManager.h
r7968 r7971 120 120 static void setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled); //tolua_export 121 121 122 static bool isCEGUIVersion7(void) { return CEGUIVERSION7; } // tolua_export123 124 122 static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export 125 123 … … 156 154 CEGUI::OgreCEGUIRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine 157 155 CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider 158 static const bool CEGUIVERSION7 = false;159 156 #else 160 157 CEGUI::OgreRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine 161 158 CEGUI::OgreResourceProvider* resourceProvider_; //!< CEGUI's resource provider 162 159 CEGUI::OgreImageCodec* imageCodec_; 163 static const bool CEGUIVERSION7 = true;164 160 #endif 165 161 LuaState* luaState_; //!< LuaState, access point to the Lua engine
Note: See TracChangeset
for help on using the changeset viewer.