[Orxonox-commit 1621] r6339 - in code/branches/presentation2/data/gui: layouts scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-12-13 17:35:59 +0100 (Sun, 13 Dec 2009)
New Revision: 6339

Modified:
   code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
   code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
Log:
Undid an error I mad while removing empty lines. Quitting from InGameMenu should work now.

Modified: code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/DecisionPopup.layout	2009-12-13 16:02:08 UTC (rev 6338)
+++ code/branches/presentation2/data/gui/layouts/DecisionPopup.layout	2009-12-13 16:35:59 UTC (rev 6339)
@@ -6,7 +6,7 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <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" />
             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >

Modified: code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua	2009-12-13 16:02:08 UTC (rev 6338)
+++ code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua	2009-12-13 16:35:59 UTC (rev 6339)
@@ -117,7 +117,7 @@
 
         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")
         line:addChildWindow(clear)