From 4ef38a92554ac217910689e5666ec028ea09251e Mon Sep 17 00:00:00 2001 From: Die4Ever Date: Tue, 7 Dec 2021 09:31:32 -0600 Subject: [PATCH] GUI: tabs with scrollbars --- gui/ThemeEngine.h | 2 +- gui/editgamedialog.cpp | 2 +- gui/themes/residualvm.zip | Bin 88416 -> 88416 bytes gui/themes/residualvm/THEMERC | 2 +- gui/themes/scummclassic.zip | Bin 14214 -> 14199 bytes gui/themes/scummclassic/THEMERC | 2 +- gui/themes/scummclassic/classic_layout.stx | 7 +-- .../scummclassic/classic_layout_lowres.stx | 7 +-- gui/themes/scummmodern.zip | Bin 61885 -> 61885 bytes gui/themes/scummmodern/THEMERC | 2 +- gui/themes/scummremastered.zip | Bin 87741 -> 87741 bytes gui/themes/scummremastered/THEMERC | 2 +- gui/widgets/tab.cpp | 48 ++++++++++-------- gui/widgets/tab.h | 2 +- 14 files changed, 36 insertions(+), 40 deletions(-) diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index adce2894baf..ffb735d14cc 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -36,7 +36,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.0" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.1" class OSystem; diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp index d7efc0ebaf9..437dab466b8 100644 --- a/gui/editgamedialog.cpp +++ b/gui/editgamedialog.cpp @@ -138,7 +138,7 @@ EditGameDialog::EditGameDialog(const Common::String &domain) // // 1) The game tab // - tab->addTab(_("Game"), "GameOptions_Game"); + tab->addTab(_("Game"), "GameOptions_Game", true); // GUI: Label & edit widget for the game ID if (g_system->getOverlayWidth() > 320) diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip index d66dfeea77027f50e066951444fc6fc3a3ae7d56..a62708c072d0e7ac28a2aa43c149975e0c7fb77a 100644 GIT binary patch delta 66 zcmaE`iS@xIR-piIW)=|!1_lm>4c_g+FI(bRCJL!AZrNzQWD3(6+s${UT-w0_li9xA Qm+=%EPtFnF74oe$!y>5 Q%Xo?nD7?Kngz+v501ZYM;{X5v diff --git a/gui/themes/residualvm/THEMERC b/gui/themes/residualvm/THEMERC index ab18b13991e..0a96b70c755 100644 --- a/gui/themes/residualvm/THEMERC +++ b/gui/themes/residualvm/THEMERC @@ -1,3 +1,3 @@ -[SCUMMVM_STX0.9.0:ResidualVM Modern Theme Remastered:No Author] +[SCUMMVM_STX0.9.1:ResidualVM Modern Theme Remastered:No Author] %using ../common %using ../common-svg diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip index 990cace669aff30de4340852cfa926d4e95182a4..456d6921337cc0ef44f1a091e043372db375f84f 100644 GIT binary patch delta 11302 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 + @@ -1251,12 +1252,6 @@ - - - - - - + @@ -1263,12 +1264,6 @@ - - - - - - E#B?H+bkRIP83pM+_KTU;R4ec+s!*KY?I`G$!sov N#mNQ|ZTeu%2ml9u8NvVn delta 64 zcmdn{n0fDGW}yIYW)=|!1_llWo&^=b-#a4~PZUyN+_2HS;Q~{?<>s9iwn=ipWHy(- N;$#DfHhr*W1OV@`7}fv) diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index 6237fb02a0a..cf23ba05de2 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1,2 +1,2 @@ -[SCUMMVM_STX0.9.0:ScummVM Modern Theme:No Author] +[SCUMMVM_STX0.9.1:ScummVM Modern Theme:No Author] %using ../common diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip index 73deee8f61cd251e81d67114805781a25a323ffb..2dbec5360720f97a445c35d1f5e4752e12e00eac 100644 GIT binary patch delta 66 zcmdnHmUZu1R-piIW)=|!1_lm>9p3H13M|g&Ckm-BZrNzgIEm?u?PjYaOFKAVGTTMG Q8BehRg||NlWW37)0J%ICegFUf diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC index e4f9ab08b40..3122cbf07bf 100644 --- a/gui/themes/scummremastered/THEMERC +++ b/gui/themes/scummremastered/THEMERC @@ -1,3 +1,3 @@ -[SCUMMVM_STX0.9.0:ScummVM Modern Theme Remastered:No Author] +[SCUMMVM_STX0.9.1:ScummVM Modern Theme Remastered:No Author] %using ../common %using ../common-svg diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp index b84d7e515df..7cdc8ba39a3 100644 --- a/gui/widgets/tab.cpp +++ b/gui/widgets/tab.cpp @@ -91,10 +91,18 @@ TabWidget::~TabWidget() { // having been switched using setActiveTab() afterward, then the // firstWidget in the _tabs list for the active tab may not be up to // date. So update it now. + + if (_activeTab != -1) + _tabs[_activeTab].firstWidget = _firstWidget; _firstWidget = nullptr; for (uint i = 0; i < _tabs.size(); ++i) { - delete _tabs[i].scrollWidget; + if (_tabs[i].scrollWidget) { + delete _tabs[i].scrollWidget; + } else { + delete _tabs[i].firstWidget; + } _tabs[i].scrollWidget = nullptr; + _tabs[i].firstWidget = nullptr; } _tabs.clear(); delete _navRight; @@ -114,7 +122,7 @@ uint16 TabWidget::getHeight() const { return _h + _tabHeight; } -int TabWidget::addTab(const Common::U32String &title, const Common::String &dialogName) { +int TabWidget::addTab(const Common::U32String &title, const Common::String &dialogName, bool withScroll) { // Add a new tab page Tab newTab; newTab.title = title; @@ -135,7 +143,12 @@ int TabWidget::addTab(const Common::U32String &title, const Common::String &dial // Activate the new tab, also writes back our _firstWidget setActiveTab(numTabs - 1); - _tabs.back().scrollWidget = new ScrollContainerWidget(this, "", dialogName); + if (withScroll) { + _tabs.back().scrollWidget = new ScrollContainerWidget(this, "", dialogName, 'gtcr'); + _tabs.back().scrollWidget->setBackgroundType(ThemeEngine::kWidgetBackgroundNo); + _tabs.back().scrollWidget->setTarget(this); + _firstWidget = _tabs.back().scrollWidget; + } return _activeTab; } @@ -145,7 +158,6 @@ Widget *TabWidget::addChild(Widget *newChild) { return Widget::addChild(newChild); newChild->setBoss(_tabs[_activeTab].scrollWidget); - _firstWidget = newChild; return _tabs[_activeTab].scrollWidget->addChild(newChild); } @@ -343,16 +355,17 @@ void TabWidget::reflowLayout() { _tabs[_activeTab].firstWidget = _firstWidget; for (uint i = 0; i < _tabs.size(); ++i) { - _tabs[i].scrollWidget->setPos(_x, _y); - _tabs[i].scrollWidget->setSize(_w, _h); - if (!_tabs[i].dialogName.empty()) { - g_gui.xmlEval()->reflowDialogLayout(_tabs[i].dialogName, _tabs[i].scrollWidget); - } + if (_tabs[i].scrollWidget) { + _tabs[i].scrollWidget->resize(_x, _y, _w, _h, false); + _tabs[i].scrollWidget->reflowLayout(); + } else { + g_gui.xmlEval()->reflowDialogLayout(_tabs[i].dialogName, _tabs[i].firstWidget); - Widget *w = _tabs[i].scrollWidget; - while (w) { - w->reflowLayout(); - w = w->next(); + Widget *w = _tabs[i].firstWidget; + while (w) { + w->reflowLayout(); + w = w->next(); + } } } @@ -408,14 +421,7 @@ void TabWidget::drawWidget() { } void TabWidget::draw() { - if (_activeTab == -1) { - Widget::draw(); - } else { - _tabs[_activeTab].firstWidget = _firstWidget; - _firstWidget = _tabs[_activeTab].scrollWidget; - Widget::draw(); - _firstWidget = _tabs[_activeTab].firstWidget; - } + Widget::draw(); if (_navButtonsVisible) { _navLeft->draw(); diff --git a/gui/widgets/tab.h b/gui/widgets/tab.h index 7c2ddd0b5c4..7b7a7f71f01 100644 --- a/gui/widgets/tab.h +++ b/gui/widgets/tab.h @@ -76,7 +76,7 @@ public: * Add a new tab with the given title. Returns a unique ID which can be used * to identify the tab (to remove it / activate it etc.). */ - int addTab(const Common::U32String &title, const Common::String &dialogName); + int addTab(const Common::U32String &title, const Common::String &dialogName, bool withScroll = false); virtual Widget *addChild(Widget *newChild);