From cd41c9f24045e63d1bf0fa2903b723b158fb1245 Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Sun, 6 Dec 2020 07:26:55 -0700 Subject: [PATCH] Added using for SceneManager.Utils. Removed unnecessary code for RNUIMouseInputHandler after having added InputManager dependency. --- SceneManager/Menus/MainMenu.cs | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/SceneManager/Menus/MainMenu.cs b/SceneManager/Menus/MainMenu.cs index 5241d4c..229ce5f 100644 --- a/SceneManager/Menus/MainMenu.cs +++ b/SceneManager/Menus/MainMenu.cs @@ -1,16 +1,14 @@ -using Rage; -using RAGENativeUI; +using RAGENativeUI; using RAGENativeUI.Elements; using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Windows.Forms; +using SceneManager.Utils; namespace SceneManager { class MainMenu { - public static UIMenu mainMenu { get; private set; } + internal static UIMenu mainMenu { get; private set; } private static UIMenuItem navigateToPathMenu, navigateToBarrierMenu, navigateToSettingsMenu; internal static void InstantiateMenu() @@ -24,9 +22,11 @@ namespace SceneManager mainMenu.AddItem(navigateToPathMenu = new UIMenuItem("Path Menu")); navigateToPathMenu.ForeColor = Color.Gold; mainMenu.BindMenuToItem(PathMainMenu.pathMainMenu, navigateToPathMenu); + mainMenu.AddItem(navigateToBarrierMenu = new UIMenuItem("Barrier Menu")); navigateToBarrierMenu.ForeColor = Color.Gold; mainMenu.BindMenuToItem(BarrierMenu.barrierMenu, navigateToBarrierMenu); + mainMenu.AddItem(navigateToSettingsMenu = new UIMenuItem("Settings")); navigateToSettingsMenu.ForeColor = Color.Gold; mainMenu.BindMenuToItem(SettingsMenu.settingsMenu, navigateToSettingsMenu); @@ -35,32 +35,9 @@ namespace SceneManager mainMenu.OnMenuOpen += MainMenu_OnMenuOpen; } - private static void ShowPathMainMenu() - { - PathMainMenu.pathMainMenu.Visible = true; - } - - private static void ShowBarrierMenu() - { - BarrierMenu.barrierMenu.Visible = true; - } - - private static void ShowSettingsMenu() - { - SettingsMenu.settingsMenu.Visible = true; - } - private static void MainMenu_OnMenuOpen(UIMenu menu) { var scrollerItems = new List { }; - var checkboxItems = new Dictionary() { }; - var selectItems = new Dictionary() - { - { navigateToPathMenu, ShowPathMainMenu }, - { navigateToBarrierMenu, ShowBarrierMenu }, - { navigateToSettingsMenu, ShowSettingsMenu } - }; - RNUIMouseInputHandler.Initialize(menu, scrollerItems); } }