Changeset 7925 for code/branches

Timestamp:

Feb 20, 2011, 1:22:25 AM (14 years ago)

Author:

landauf

Message:

if a menu sheet was opened with the keyboard, preselect the first button

Location:

code/branches/usability/data/gui/scripts

Files:

• GUISheet.lua (modified) (1 diff)
• SheetManager.lua (modified) (2 diffs)

code/branches/usability/data/gui/scripts/GUISheet.lua

@@ -140 +140 @@
 function P:pressSelectedButton()
     if self:hasSelection() then
+        self.pressedEnter = true
         self:getSelectedButton().callback()
+        self.pressedEnter = false
     end
 end

code/branches/usability/data/gui/scripts/SheetManager.lua

@@ -121 +121 @@
 
     -- Hide all previous sheets if necessary
+    local previous
     if bHidePrevious then
         for i = 1, activeMenuSheets.size - 1 do
-            activeMenuSheets[i].sheet:hide()
+            previous = activeMenuSheets[i].sheet
+            previous:hide()
         end
     end
@@ -129 +131 @@
     menuSheet:show()
     menuSheetsRoot:activate()
+
+    -- select first button if the menu was opened with the keyboard
+    if previous and previous.pressedEnter and menuSheet.buttons and menuSheet:hasSelection() == false then
+        menuSheet:moveSelection(1, 0)
+    end
 
     return menuSheet