TwoPane dialogs: Respect NoBackButton in landscape too

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-11-06 18:29:59 +01:00
1 parent c37c089bc5
commit da79b621b0
1 file changed
+4 -1
+4 -1
View File
@@ -144,6 +144,9 @@ void UITwoPaneBaseDialogScreen::CreateViews() {
if (flags_ & TwoPaneFlags::DropShadowTitle) {
topBarFlags |= TopBarFlags::DropShadowTitle;
}
if (flags_ & TwoPaneFlags::NoBackButton) {
topBarFlags |= TopBarFlags::NoBackButton;
}
TopBar *topBar = nullptr;
if (!(flags_ & TwoPaneFlags::NoTopbarInLandscape)) {
topBar = root->Add(new TopBar(*screenManager()->getUIContext(), topBarFlags, title, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, Margins(12, 12, 12, 12))));
@@ -166,7 +169,7 @@ void UITwoPaneBaseDialogScreen::CreateViews() {
LinearLayout *settingsPane = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, Margins(0, 8, 0, 0)));
settingsPane->SetSpacing(0.0f);
if (flags_ & TwoPaneFlags::NoTopbarInLandscape) {
if ((flags_ & TwoPaneFlags::NoTopbarInLandscape) && !(flags_ & TwoPaneFlags::NoBackButton)) {
// We still need a back button.
Choice *backButton = settingsPane->Add(new Choice(di->T("Back"), ImageID("I_NAVIGATE_BACK"), new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, Margins(12, 0, 12, 0))));
backButton->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);