Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

TabHolder sanity check. Code cleanup.

Browse Source
This commit is contained in:
Henrik Rydgård committed 2026-05-13 17:18:42 +02:00
1 parent 6165edd445
commit d9eb513600
2 files changed
+24 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/UI/TabHolder.cpp
+20 -14
View File
@@ -114,24 +114,26 @@ void TabHolder::EnsureAllCreated() {
}
}
// Returns true if this created a tab.
bool TabHolder::EnsureTab(int index) {
_dbg_assert_(index >= 0 && index < createFuncs_.size());
_assert_(index >= 0 && index < createFuncs_.size());
if (!tabs_[index]) {
_dbg_assert_(index < createFuncs_.size());
_dbg_assert_(createFuncs_[index]);
std::function<UI::ViewGroup * ()> func;
createFuncs_[index].swap(func);
ViewGroup *tabContents = func();
tabs_[index] = tabContents;
contents_->Add(tabContents);
tabContents->ReplaceLayoutParams(new AnchorLayoutParams(FILL_PARENT, FILL_PARENT));
return true;
} else {
if (tabs_[index]) {
// Tab already created.
return false;
}
_dbg_assert_(index < createFuncs_.size());
_dbg_assert_(createFuncs_[index]);
std::function<UI::ViewGroup * ()> func;
createFuncs_[index].swap(func);
ViewGroup *tabContents = func();
tabs_[index] = tabContents;
contents_->Add(tabContents);
tabContents->ReplaceLayoutParams(new AnchorLayoutParams(FILL_PARENT, FILL_PARENT));
return true;
}
void TabHolder::SetInitialTab(int tab) {
@@ -177,6 +179,10 @@ bool TabHolder::SetCurrentTab(int tab, bool skipTween) {
view->AddTween(tween)->Persist();
};
// Ensure both tabs are created before setting up tweens.
bool createdCurrent = EnsureTab(currentTab_);
_dbg_assert_msg_(!createdCurrent, false, "Current should already be created here!");
bool created = EnsureTab(tab);
Orientation orient = Opposite(orientation_);