From d3fa128d5408673b0ea8d3ba3435c38b258a5e7a Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sat, 5 Jun 2021 14:58:09 -0700 Subject: Merge UIState into GlobalStates --- core/src/UI/UI_Items.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core/src/UI/UI_Items.cpp') diff --git a/core/src/UI/UI_Items.cpp b/core/src/UI/UI_Items.cpp index 7ed8f80..d006166 100644 --- a/core/src/UI/UI_Items.cpp +++ b/core/src/UI/UI_Items.cpp @@ -3,7 +3,6 @@ #include "Model/GlobalStates.hpp" #include "Model/Project.hpp" #include "UI/Localization.hpp" -#include "UI/States.hpp" #include #include @@ -32,7 +31,7 @@ ActionResult ItemEditor(ItemList& list, T* item) }; auto ls = LocaleStrings::Instance.get(); - auto& uis = UIState::GetInstance(); + auto& gs = GlobalStates::GetInstance(); static bool duplicateName = false; @@ -117,7 +116,7 @@ void ItemListEntries(ItemList& list, int& selectedIdx) constexpr int kColumns = 1 /* Name column */ + kHasDescription + kHasEmail + kHasStock + kHasPrice; auto ls = LocaleStrings::Instance.get(); - auto& uis = UIState::GetInstance(); + auto& gs = GlobalStates::GetInstance(); if (ImGui::BeginTable("", kColumns, ImGuiTableFlags_Borders)) { @@ -241,19 +240,19 @@ void ItemListEditor(ItemList& list) void UI::ItemsTab() { auto ls = LocaleStrings::Instance.get(); - auto& uis = UIState::GetInstance(); + auto& gs = GlobalStates::GetInstance(); if (ImGui::BeginTabBar("ItemViewTabs")) { if (ImGui::BeginTabItem(ls->ProductCategoryName.Get())) { - ItemListEditor(uis.CurrentProject->Products); + ItemListEditor(gs.GetCurrentProject()->Products); ImGui::EndTabItem(); } if (ImGui::BeginTabItem(ls->FactoryCategoryName.Get())) { - ItemListEditor(uis.CurrentProject->Factories); + ItemListEditor(gs.GetCurrentProject()->Factories); ImGui::EndTabItem(); } if (ImGui::BeginTabItem(ls->CustomerCategoryName.Get())) { - ItemListEditor(uis.CurrentProject->Customers); + ItemListEditor(gs.GetCurrentProject()->Customers); ImGui::EndTabItem(); } ImGui::EndTabBar(); -- cgit v1.2.3-70-g09d2