Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6339 for code/branches


Ignore:
Timestamp:
Dec 13, 2009, 5:35:59 PM (15 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/layouts/DecisionPopup.layout

    r6335 r6339  
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    88        <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
    9             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /
     9            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1010            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    1111            <Property Name="Alpha" Value="0.6" />
  • code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua

    r6336 r6339  
    118118        local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
    119119        clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
    120         clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, (i*(buttonWidth+clearWidth+spaceWidth)+buttonWidth)+commandWidth+clearWidth+2*spaceWidth), CEGUI.UDim(0.15, 0)))
     120        clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
    121121        clear:setText("X")
    122122        orxonox.KeyBinderManager:getInstance():subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
Note: See TracChangeset for help on using the changeset viewer.