Changeset 7925 for code/branches/usability
- Timestamp:
- Feb 20, 2011, 1:22:25 AM (14 years ago)
- Location:
- code/branches/usability/data/gui/scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/usability/data/gui/scripts/GUISheet.lua
r7922 r7925 140 140 function P:pressSelectedButton() 141 141 if self:hasSelection() then 142 self.pressedEnter = true 142 143 self:getSelectedButton().callback() 144 self.pressedEnter = false 143 145 end 144 146 end -
code/branches/usability/data/gui/scripts/SheetManager.lua
r7922 r7925 121 121 122 122 -- Hide all previous sheets if necessary 123 local previous 123 124 if bHidePrevious then 124 125 for i = 1, activeMenuSheets.size - 1 do 125 activeMenuSheets[i].sheet:hide() 126 previous = activeMenuSheets[i].sheet 127 previous:hide() 126 128 end 127 129 end … … 129 131 menuSheet:show() 130 132 menuSheetsRoot:activate() 133 134 -- select first button if the menu was opened with the keyboard 135 if previous and previous.pressedEnter and menuSheet.buttons and menuSheet:hasSelection() == false then 136 menuSheet:moveSelection(1, 0) 137 end 131 138 132 139 return menuSheet
Note: See TracChangeset
for help on using the changeset viewer.