Changeset 7985 for code/branches

Timestamp:

Feb 27, 2011, 8:09:59 AM (14 years ago)

Author:

rgrieder

Message:

Fixed keyESC hack: after opening and closing the console, the first ESC keystroke was ignored.

Location:

code/branches/usability

Files:

• data/gui/scripts/SheetManager.lua (modified) (3 diffs)
• src/orxonox/overlays/InGameConsole.cc (modified) (2 diffs)

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

@@ -5 +5 @@
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
-local bInGameConsoleClosed = false
+local bInGameConsoleOpen = false
 local mainMenuLoaded = false
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
@@ -221 +221 @@
 
     -- If the InGameConsole is active, ignore the ESC command.
-    if bInGameConsoleClosed == true then
-        bInGameConsoleClosed = false
+    if bInGameConsoleOpen then
         return
     end
@@ -279 +278 @@
 end
 
+function inGameConsoleOpened()
+    bInGameConsoleOpen = true
+end
+
 function inGameConsoleClosed()
-    bInGameConsoleClosed = not bInGameConsoleClosed;
+    bInGameConsoleOpen = false
 end
 

code/branches/usability/src/orxonox/overlays/InGameConsole.cc

@@ -513 +513 @@
             this->bActive_ = true;
             InputManager::getInstance().enterState("console");
+            GUIManager::getInstance().getLuaState()->doString("inGameConsoleOpened()"); // Notify the SheetManager in lua, that the console has been closed.
             this->shell_->registerListener(this);
 
@@ -611 +612 @@
     /*static*/ void InGameConsole::closeConsole()
     {
-        GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()");  // Notify the SheetManager in lua, that the console has been closed, but not by ESC.
         InGameConsole::getInstance().deactivate();
     }