aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perform restartLayout conditionally (#4513)

Browse source 
* Revert "Fixed layout on Deck Editor not using last layout. It was reseting layout on ctor. (#4420)"

This reverts commit 3bc90003b3.

* restart layout on fresh installs
This commit is contained in:
ebbit1q 2022-01-08 22:03:53 +01:00 committed by GitHub
parent 26d1fcc944
commit 7903cd520a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/tab_deck_editor.cpp
View file

@ -559,8 +559,13 @@ void TabDeckEditor::refreshShortcuts()
void TabDeckEditor::loadLayout() void TabDeckEditor::loadLayout()
{ {
LayoutsSettings &layouts = SettingsCache::instance().layouts(); LayoutsSettings &layouts = SettingsCache::instance().layouts();
restoreState(layouts.getDeckEditorLayoutState()); auto &layoutState = layouts.getDeckEditorLayoutState();
restoreGeometry(layouts.getDeckEditorGeometry()); if (layoutState.isNull()) {
restartLayout();
} else {
restoreState(layoutState);
restoreGeometry(layouts.getDeckEditorGeometry());
}
aCardInfoDockVisible->setChecked(cardInfoDock->isVisible()); aCardInfoDockVisible->setChecked(cardInfoDock->isVisible());
aFilterDockVisible->setChecked(filterDock->isVisible()); aFilterDockVisible->setChecked(filterDock->isVisible());
@ -605,7 +610,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts())); connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts(); refreshShortcuts();
QTimer::singleShot(0, this, SLOT(loadLayout())); loadLayout();
} }
TabDeckEditor::~TabDeckEditor() TabDeckEditor::~TabDeckEditor()