From 23e3d0b49aac7978e8f5bb762bb0f171ba005b66 Mon Sep 17 00:00:00 2001 From: Andrew Lanzone Date: Thu, 31 Jul 2025 17:50:14 -0700 Subject: [PATCH] Initialize inventory tabs in a loop --- apps/openmw/mwgui/inventorytabsoverlay.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/apps/openmw/mwgui/inventorytabsoverlay.cpp b/apps/openmw/mwgui/inventorytabsoverlay.cpp index 7464a3b1ec..940e9fec7d 100644 --- a/apps/openmw/mwgui/inventorytabsoverlay.cpp +++ b/apps/openmw/mwgui/inventorytabsoverlay.cpp @@ -14,22 +14,14 @@ namespace MWGui : WindowBase("openmw_inventory_tabs.layout") { MyGUI::Button* tab; + constexpr char* kTabIds[] = { "TabMap", "TabInventory", "TabSpells", "TabStats" }; - getWidget(tab, "TabMap"); - tab->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryTabsOverlay::onTabClicked); - mTabs.push_back(tab); - - getWidget(tab, "TabInventory"); - tab->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryTabsOverlay::onTabClicked); - mTabs.push_back(tab); - - getWidget(tab, "TabSpells"); - tab->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryTabsOverlay::onTabClicked); - mTabs.push_back(tab); - - getWidget(tab, "TabStats"); - tab->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryTabsOverlay::onTabClicked); - mTabs.push_back(tab); + for (const char* id : kTabIds) + { + getWidget(tab, id); + tab->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryTabsOverlay::onTabClicked); + mTabs.push_back(tab); + } MyGUI::ImageBox* image; getWidget(image, "BtnL2Image");