From 00fd95526677d670d002ca81069636f0f74b91f7 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Wed, 28 Apr 2021 15:18:51 -0700 Subject: Code cleanup, fix database view paging and selection --- core/src/UI/UI_Items.cpp | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 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 56d6c2a..899db6e 100644 --- a/core/src/UI/UI_Items.cpp +++ b/core/src/UI/UI_Items.cpp @@ -220,27 +220,19 @@ void UI::ItemsTab() { auto ls = LocaleStrings::Instance.get(); auto& uis = UIState::GetInstance(); - constexpr float kAmount = 16.0f; - int id = 0; - if (ImGui::CollapsingHeader(ls->ProductCategoryName.Get())) { - ImGui::PushID(id++); - ImGui::Indent(kAmount); - ItemListEditor(uis.CurrentProject->Products); - ImGui::Unindent(kAmount); - ImGui::PopID(); - } - if (ImGui::CollapsingHeader(ls->FactoryCategoryName.Get())) { - ImGui::PushID(id++); - ImGui::Indent(kAmount); - ItemListEditor(uis.CurrentProject->Factories); - ImGui::Unindent(kAmount); - ImGui::PopID(); - } - if (ImGui::CollapsingHeader(ls->CustomerCategoryName.Get())) { - ImGui::PushID(id++); - ImGui::Indent(kAmount); - ItemListEditor(uis.CurrentProject->Customers); - ImGui::Unindent(kAmount); - ImGui::PopID(); + if (ImGui::BeginTabBar("##ItemViewTabs")) { + if (ImGui::BeginTabItem(ls->ProductCategoryName.Get())) { + ItemListEditor(uis.CurrentProject->Products); + ImGui::EndTabItem(); + } + if (ImGui::BeginTabItem(ls->FactoryCategoryName.Get())) { + ItemListEditor(uis.CurrentProject->Factories); + ImGui::EndTabItem(); + } + if (ImGui::BeginTabItem(ls->CustomerCategoryName.Get())) { + ItemListEditor(uis.CurrentProject->Customers); + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); } } -- cgit v1.2.3-70-g09d2