C# MenuHandler: Added inheritance of MouseSettings and fixed drawing …

…on top of controls
manups4e · Nov 8, 2023 · 1be6023 · 1be6023
1 parent dab4573
commit 1be6023
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ScaleformUI_Csharp/Menus/MenuHandler.cs b/ScaleformUI_Csharp/Menus/MenuHandler.cs
@@ -71,16 +71,14 @@ public static async Task SwitchTo(this MenuBase currentMenu, MenuBase newMenu, i
                         if (old._customTexture.Key != null && old._customTexture.Value != null)
                             newer.SetBannerType(old._customTexture);
                         newer.Offset = old.Offset;
-                        newer.MouseEdgeEnabled = old.MouseEdgeEnabled;
-                        newer.MouseWheelControlEnabled = old.MouseWheelControlEnabled;
-                        newer.MouseControlsEnabled = old.MouseControlsEnabled;
                         newer.MaxItemsOnScreen = old.MaxItemsOnScreen;
                         newer.AnimationType = old.AnimationType;
                         newer.BuildingAnimation = old.BuildingAnimation;
                         newer.ScrollingType = old.ScrollingType;
                         newer.Glare = old.Glare;
                         newer.EnableAnimation = old.EnableAnimation;
                         newer.Enabled3DAnimations = old.Enabled3DAnimations;
+                        newer.MouseSettings(old.MouseControlsEnabled, old.MouseEdgeEnabled, old.MouseWheelControlEnabled, old.ResetCursorOnOpen, old.leftClickEnabled);
                     }
                     newer.CurrentSelection = newMenuCurrentSelection != 0 ? newMenuCurrentSelection : 0;
                 }
@@ -144,9 +142,9 @@ internal static void Draw()
         /// </summary>
         public static async void ProcessMenus()
         {
+            Draw();
             ProcessControl();
             ProcessMouse();
-            Draw();
         }
 
         /// <summary>