Merge pull request #55 from TomGrobbe/development

Bugfix + debugging change - Added a "fix" for the fast scrolling "bug". - Also removed the discord rich presence for when you're not using vMenu with Debug mode enabled.
TomGrobbe · Mar 9, 2018 · 5541e28 · 5541e28
2 parents c81663b + aeb3900
commit 5541e28
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/NativeUI.dll b/NativeUI.dll
diff --git a/NativeUI.dll.old b/NativeUI.dll.old
diff --git a/vMenu/CommonFunctions.cs b/vMenu/CommonFunctions.cs
@@ -1635,6 +1635,18 @@ public void Log(string data)
             Debug.WriteLine(data, "");
         }
         #endregion
+
+        public UIMenu GetOpenMenu()
+        {
+            foreach (UIMenu m in MainMenu.Mp.ToList())
+            {
+                if (m.Visible)
+                {
+                    return m;
+                }
+            }
+            return null;
+        }
 
     }
 }
diff --git a/vMenu/MainMenu.cs b/vMenu/MainMenu.cs
@@ -55,7 +55,11 @@ public class MainMenu : BaseScript
         public MainMenu()
         {
             // Set discord rich precense once, allowing it to be overruled by other resources once those load.
-            SetRichPresence($"{(DebugMode ? "Debugging" : "Enjoying")} vMenu {Version}!");
+            if (DebugMode)
+            {
+                SetRichPresence($"Debugging vMenu {Version}!");
+            }
+
             if (GetCurrentResourceName() != "vMenu")
             {
                 Exception InvalidNameException = new Exception("\r\n\r\n[vMenu] INSTALLATION ERROR!\r\nThe name of the resource is not valid. Please change the folder name from '" + GetCurrentResourceName() + "' to 'vMenu' (case sensitive) instead!\r\n\r\n\r\n");
@@ -72,6 +76,7 @@ public MainMenu()
             else
             {
                 Tick += OnTick;
+                Tick += ProcessMenus;
             }
 
         }
@@ -93,7 +98,6 @@ public static void SetPermissions(dynamic dict)
                 // Add the new permission to the dictionary.
                 PermissionsManager.SetPermission(permission.Key.ToString(), permission.Value);
             }
-
             permissionsSetupDone = true;
         }
         #endregion
@@ -113,6 +117,16 @@ public static void SetOptions(dynamic options)
             optionsSetupDone = true;
         }
 
+        /// <summary>
+        /// This has to be separated from the "draw" function to fix the fast scrolling bug.
+        /// </summary>
+        /// <returns></returns>
+        private async Task ProcessMenus()
+        {
+            await Mp.ProcessControlAsync();
+            Mp.WidthOffset = 50;
+        }
+
         /// <summary>
         /// OnTick runs every game tick.
         /// </summary>
@@ -282,10 +296,8 @@ private async Task OnTick()
                     }
                 }
                 #endregion
-
-                // Process all menus in the menu pool (displays them when they're active).
-                Mp.ProcessMenus();
-                Mp.WidthOffset = 50;
+                // Only draw the menu each frame, control handling is done in another Tick task because that needs delays.
+                Mp.Draw();
             }
         }