jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-05 01:23:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Place current deck-editor docks before restoring saved layouts [skip ci] (#7734)

Browse source
This commit is contained in:
Bryce! 2026-11-03 22:37:25 -05:00 • committed by GitHub
parent c72192fd81
commit 7768416091
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
View file

@ -131,10 +131,16 @@ void TabDeckEditor::loadLayout()
LayoutsSettings &layouts = SettingsCache::instance().layouts();
auto layoutState = layouts.getDeckEditorLayoutState();
if (layoutState.isNull()) {
restartLayout();
} else {
restoreState(layoutState);
// Start with every current dock placed. Saved layouts from older versions
// cannot describe docks introduced later; restoreState leaves those docks
// in their existing positions while restoring the saved docks, including
// their visibility and floating state.
restartLayout();
if (!layoutState.isEmpty()) {
if (!restoreState(layoutState)) {
// A corrupt or incompatible state must not leave a partial layout.
restartLayout();
}
restoreGeometry(layouts.getDeckEditorGeometry());
}
}