thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: tabs with scrollbars for more pages

Browse source
This commit is contained in:
Die4Ever 2021-12-07 13:13:44 -06:00 • committed by Filippos Karapetis
parent 4ef38a9255
commit 42a27fda40
6 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gui/widgets/tab.cpp
View file

@ -161,6 +161,14 @@ Widget *TabWidget::addChild(Widget *newChild) {
return _tabs[_activeTab].scrollWidget->addChild(newChild);
}
void TabWidget::removeWidget(Widget *del) {
if (_activeTab == -1 || _tabs[_activeTab].scrollWidget == nullptr){
Widget::removeWidget(del);
return;
}
_tabs[_activeTab].scrollWidget->removeWidget(del);
}
void TabWidget::removeTab(int tabID) {
assert(0 <= tabID && tabID < (int)_tabs.size());
@ -171,7 +179,11 @@ void TabWidget::removeTab(int tabID) {
}
// Dispose the widgets in that tab and then the tab itself
delete _tabs[tabID].scrollWidget;
if (_tabs[tabID].scrollWidget) {
delete _tabs[tabID].scrollWidget;
} else {
delete _tabs[tabID].firstWidget;
}
_tabs.remove_at(tabID);
// Adjust _firstVisibleTab if necessary
@ -201,7 +213,10 @@ void TabWidget::setActiveTab(int tabID) {
releaseFocus();
}
_activeTab = tabID;
_firstWidget = _tabs[tabID].firstWidget;
if (_tabs[tabID].scrollWidget)
_firstWidget = _tabs[_activeTab].scrollWidget;
else
_firstWidget = _tabs[tabID].firstWidget;
// Also ensure the tab is visible in the tab bar
if (_firstVisibleTab > tabID)