TabView added disabled item checks

manups4e · May 11, 2022 · 5249308 · 5249308
1 parent 903f935
commit 5249308
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/MenuExample/MenuExample.csproj b/MenuExample/MenuExample.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CitizenFX.Core.Client, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CitizenFX.Core.Client.1.0.5539\lib\net45\CitizenFX.Core.Client.dll</HintPath>
+      <HintPath>..\packages\CitizenFX.Core.Client.1.0.5546\lib\net45\CitizenFX.Core.Client.dll</HintPath>
     </Reference>
     <Reference Include="ScaleformUI, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/MenuExample/packages.config b/MenuExample/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CitizenFX.Core.Client" version="1.0.5539" targetFramework="net452" />
+  <package id="CitizenFX.Core.Client" version="1.0.5546" targetFramework="net452" />
 </packages>
diff --git a/ScaleformUI_Csharp/PauseMenu/TabView.cs b/ScaleformUI_Csharp/PauseMenu/TabView.cs
@@ -382,7 +382,6 @@ public async void Select(bool playSound)
                         var leftItem = Tabs[Index].LeftItemList[LeftItemIndex];
                         if (leftItem.ItemType == LeftItemType.Settings)
                         {
-
                             if (leftItem.ItemList[RightItemIndex] is SettingsItem rightItem)
                             {
                                 if (!rightItem.Enabled)
@@ -549,7 +548,7 @@ public async void GoRight()
         private int context = 0;
         private int unused = 0;
 
-        public override void ProcessMouse()
+        public override async void ProcessMouse()
         {
             if (!IsUsingKeyboard(2))
             {
@@ -574,6 +573,13 @@ public override void ProcessMouse()
                                 _pause.SelectTab(itemId);
                                 FocusLevel = 1;
                                 Index = itemId;
+                                if (Tabs[Index].LeftItemList.All(x => !x.Enabled)) break;
+                                while (!Tabs[Index].LeftItemList[leftItemIndex].Enabled)
+                                {
+                                    await BaseScript.Delay(0);
+                                    leftItemIndex++;
+                                    _pause._pause.CallFunction("SELECT_LEFT_ITEM_INDEX", leftItemIndex);
+                                }
                                 break;
                                 /* TODO: CHANGE IT WITH SPRITE LIKE THE ACTUAL PAUSE MENU
                             case 1:
@@ -603,6 +609,13 @@ public override void ProcessMouse()
                         {
                             case 0: // going from unfocused to focused
                                 FocusLevel = 1;
+                                if (Tabs[Index].LeftItemList.All(x => !x.Enabled)) break;
+                                while (!Tabs[Index].LeftItemList[leftItemIndex].Enabled)
+                                {
+                                    await BaseScript.Delay(0);
+                                    leftItemIndex++;
+                                    _pause._pause.CallFunction("SELECT_LEFT_ITEM_INDEX", leftItemIndex);
+                                }
                                 break;
                             case 1: // left item in subitem tab pressed
                                 if (focusLevel != 1)

diff --git a/ScaleformUI_Csharp/ScaleformUI.csproj b/ScaleformUI_Csharp/ScaleformUI.csproj
@@ -34,8 +34,8 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CitizenFX.Core.Client, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\CitizenFX.Core.Client.1.0.5020\lib\net45\CitizenFX.Core.Client.dll</HintPath>
+    <Reference Include="CitizenFX.Core.Client, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CitizenFX.Core.Client.1.0.5546\lib\net45\CitizenFX.Core.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -49,14 +49,23 @@
     <Compile Include="Hud\Notifications\NotificationChars.cs" />
     <Compile Include="Hud\Notifications\Notifications.cs" />
     <Compile Include="Items\UIMenuStatsItem.cs" />
+    <Compile Include="LobbyMenu\Items\FriendItem.cs" />
+    <Compile Include="LobbyMenu\Items\LobbyItem.cs" />
+    <Compile Include="LobbyMenu\Items\MMPLayerItem.cs" />
+    <Compile Include="LobbyMenu\MainView.cs" />
+    <Compile Include="PauseMenuBase.cs" />
     <Compile Include="PauseMenu\Items\BasicTabItem.cs" />
     <Compile Include="PauseMenu\Items\KeymapItem.cs" />
-    <Compile Include="PauseMenu\Items\SettingsTabItem.cs" />
+    <Compile Include="PauseMenu\Items\SettingsItems\SettingsProgressItem.cs" />
+    <Compile Include="PauseMenu\Items\SettingsItems\SettingsCheckboxItem.cs" />
+    <Compile Include="PauseMenu\Items\SettingsItems\SettingsListItem.cs" />
+    <Compile Include="PauseMenu\Items\SettingsItems\SettingsSliderItem.cs" />
+    <Compile Include="PauseMenu\Items\SettingsItems\SettingsItem.cs" />
     <Compile Include="PauseMenu\Items\StatsTabItem.cs" />
     <Compile Include="PauseMenu\Tabs\BaseTab.cs" />
-    <Compile Include="PauseMenu\Tabs\TabSubmenuItem.cs" />
+    <Compile Include="PauseMenu\Tabs\SubmenuTab.cs" />
     <Compile Include="PauseMenu\Tabs\TabLeftItem.cs" />
-    <Compile Include="PauseMenu\Tabs\TabTextItem.cs" />
+    <Compile Include="PauseMenu\Tabs\TextTab.cs" />
     <Compile Include="PauseMenu\TabView.cs" />
     <Compile Include="Scaleforms\BigMessage\BigMessage.cs" />
     <Compile Include="Controls.cs" />

diff --git a/ScaleformUI_Csharp/packages.config b/ScaleformUI_Csharp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CitizenFX.Core.Client" version="1.0.5020" targetFramework="net452" />
+  <package id="CitizenFX.Core.Client" version="1.0.5546" targetFramework="net452" />
 </packages>