Changeset 10165 for ps

Timestamp:

09/02/11 02:33:19 (13 years ago)

Author:

brian

Message:

Fix squished menu background and make clicking on background hide the submenu

Location:

ps/trunk/binaries/data/mods/public/gui/pregame

Files:

• mainmenu.js (modified) (6 diffs)
• mainmenu.xml (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js

@@ -1 +1 @@
 var userReportEnabledText; // contains the original version with "$status" placeholder
-var currentSubmenu; // contains placeholder submenu
-const MARGIN = 4;
+var currentSubmenuType; // contains submenu type
+const MARGIN = 4; // menu border size
 
 function init()
@@ -10 +10 @@
 
     userReportEnabledText = getGUIObjectByName("userReportEnabledText").caption;
-        currentSubmenu = "submenuSinglePlayer";
+
+        // initialize currentSubmenuType with placeholder to avoid null
+        currentSubmenuType = "submenuSinglePlayer";
 }
 
@@ -33 +35 @@
     var left = screen.right - w * (1 + Math.ceil(screen.right / w));
     layer1.size = new GUISize(left + off1, screen.top, screen.right + off1, screen.bottom);
-
-    layer2.size = new GUISize(screen.right - h + off2, screen.top, screen.right + off2, screen.bottom);
+    layer2.size = new GUISize(screen.right/2 - h + off2, screen.top, screen.right/2 + h + off2, screen.bottom);
     layer3.size = new GUISize(screen.right - h + off3, screen.top, screen.right + off3, screen.bottom);
 }
@@ -144 +145 @@
 
         // switch to new submenu type
-        currentSubmenu = newSubmenu;
-        getGUIObjectByName(currentSubmenu).hidden = false;
+        currentSubmenuType = newSubmenu;
+        getGUIObjectByName(currentSubmenuType).hidden = false;
 
         // set position of new submenu
@@ -156 +157 @@
         blendSubmenuIntoMain(top, bottom);
 
-        // prepare to hide the submenu when the mouse moves off of the submenu
+        // Reveal submenu
         getGUIObjectByName("submenu").hidden = false;
+
+        // prepare to hide the submenu when the user clicks on the background
+        getGUIObjectByName("submenuScreen").hidden = false;
 }
 
@@ -164 +168 @@
 {
         // remove old submenu type
-        getGUIObjectByName(currentSubmenu).hidden = true;
-
-        // hide submenu
-        getGUIObjectByName("submenu").hidden = true;
-
-        // reset submenu position
-        getGUIObjectByName("submenu").size = getGUIObjectByName("mainMenu").size;
+        getGUIObjectByName(currentSubmenuType).hidden = true;
+
+        // hide submenu and reset position
+        var submenu = getGUIObjectByName("submenu");
+        submenu.hidden = true;
+        submenu.size = getGUIObjectByName("mainMenu").size;
 
         // reset main menu panel right border
         getGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% 100%";
+
+        // hide submenu screen
+        getGUIObjectByName("submenuScreen").hidden = false;
+        console.write(getGUIObjectByName("submenuScreen").hidden);
 }
 

ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml

@@ -147 +147 @@
         </object>
 
+
                 <!--
         ==========================================
@@ -152 +153 @@
         ==========================================
         -->
+
+                <!-- submenu screen (hides submenu when clicked -->
+                <object name="submenuScreen"
+                        type="button"
+                        size="0 0 100% 100%"
+                        hidden="true"
+                >
+                        <action on="Press">
+                                closeMenu();
+                        </action>
+                </object>
 
                 <!-- submenu -->