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

Timestamp:

Feb 23, 2018, 12:20:35 AM (6 years ago)

Author:

landauf

Message:

updated HostMenu.lua, MultiplayerMenu.lua, ShipSelectionMenu.lua, SingleplayerConfigMenu.lua to cegui 0.8

File:

• code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUITools.lua (modified) (2 diffs)

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():getHeight() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getHeight()
-    local width =  window:getFont():getTextExtent(window:getText()) + window:getUnclippedOuterRect():getWidth() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getWidth()
+    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()
 
     table.insert(size, height)
@@ -40 +40 @@
 
 function getScrollingStepSize(window)
-    local height = window:getUnclippedOuterRect():getHeight()
-    local maxHeight = CEGUI.System:getSingleton():getGUISheet():getUnclippedOuterRect():getHeight()
+    local height = window:getUnclippedOuterRect():get():getHeight()
+    local maxHeight = window:getRootWindow():getUnclippedOuterRect():get():getHeight()
     local ratio = height/maxHeight
     return 0.008*ratio/0.3204