Changeset 6339

Timestamp:

Dec 13, 2009, 5:35:59 PM (14 years ago)

Author:

dafrick

Message:

Undid an error I mad while removing empty lines. Quitting from InGameMenu should work now.

Location:

code/branches/presentation2/data/gui

Files:

• layouts/DecisionPopup.layout (modified) (1 diff)
• scripts/KeyBindMenu.lua (modified) (1 diff)

code/branches/presentation2/data/gui/layouts/DecisionPopup.layout

@@ -7 +7 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <Property Name="Alpha" Value="0.6" />

code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua

@@ -118 +118 @@
         local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
         clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
-        clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, (i*(buttonWidth+clearWidth+spaceWidth)+buttonWidth)+commandWidth+clearWidth+2*spaceWidth), CEGUI.UDim(0.15, 0)))
+        clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
         clear:setText("X")
         orxonox.KeyBinderManager:getInstance():subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")