jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 11:38:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove all separate storing of widget sizes, rely on geometry (#6712)

Browse source
This commit is contained in:
ebbit1q 2026-03-16 23:38:47 +01:00 • committed by GitHub
parent dd8164611b
commit 69c046cca4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 8 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
View file

@ -237,7 +237,6 @@ protected slots:
// UI Layout Management // UI Layout Management
virtual void loadLayout() = 0; virtual void loadLayout() = 0;
virtual void restartLayout() = 0; virtual void restartLayout() = 0;
virtual void freeDocksSize() = 0;
virtual void refreshShortcuts() = 0; virtual void refreshShortcuts() = 0;
/** @brief Handles dock close events. */ /** @brief Handles dock close events. */

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

@ -143,17 +143,6 @@ void TabDeckEditor::loadLayout()
restoreState(layoutState); restoreState(layoutState);
restoreGeometry(layouts.getDeckEditorGeometry()); restoreGeometry(layouts.getDeckEditorGeometry());
} }
for (auto it = dockToActions.constKeyValueBegin(); it != dockToActions.constKeyValueEnd(); ++it) {
auto dockWidget = it->first;
auto actions = it->second;
QSize size = layouts.getDeckEditorWidgetSize(dockWidget->objectName(), actions.defaultSize);
dockWidget->setMinimumSize(size);
dockWidget->setMaximumSize(size);
}
QTimer::singleShot(100, this, &TabDeckEditor::freeDocksSize);
} }
/** /**
@ -177,17 +166,6 @@ void TabDeckEditor::restartLayout()
splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal); splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal);
splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal); splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Vertical); splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Vertical);
QTimer::singleShot(100, this, &TabDeckEditor::freeDocksSize);
}
/** @brief Frees dock sizes to allow flexible resizing. */
void TabDeckEditor::freeDocksSize()
{
for (auto dockWidget : dockToActions.keys()) {
dockWidget->setMinimumSize(100, 100);
dockWidget->setMaximumSize(5000, 5000);
}
} }
/** /**
@ -202,10 +180,6 @@ bool TabDeckEditor::eventFilter(QObject *o, QEvent *e)
LayoutsSettings &layouts = SettingsCache::instance().layouts(); LayoutsSettings &layouts = SettingsCache::instance().layouts();
layouts.setDeckEditorLayoutState(saveState()); layouts.setDeckEditorLayoutState(saveState());
layouts.setDeckEditorGeometry(saveGeometry()); layouts.setDeckEditorGeometry(saveGeometry());
for (auto dockWidget : dockToActions.keys()) {
layouts.setDeckEditorWidgetSize(dockWidget->objectName(), dockWidget->size());
}
} }
return false; return false;
} }

3
cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
View file

@ -62,9 +62,6 @@ protected slots:
/** @brief Resets the layout to default positions and dock states. */ /** @brief Resets the layout to default positions and dock states. */
void restartLayout() override; void restartLayout() override;
/** @brief Frees the dock sizes for resizing flexibility. */
void freeDocksSize() override;
/** @brief Refreshes shortcuts for this tab from settings. */ /** @brief Refreshes shortcuts for this tab from settings. */
void refreshShortcuts() override; void refreshShortcuts() override;

60
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -1085,38 +1085,9 @@ void TabGame::loadLayout()
if (replayDock) { if (replayDock) {
restoreGeometry(layouts.getReplayPlayAreaGeometry()); restoreGeometry(layouts.getReplayPlayAreaGeometry());
restoreState(layouts.getReplayPlayAreaLayoutState()); restoreState(layouts.getReplayPlayAreaLayoutState());
for (auto it = dockToActions.constKeyValueBegin(); it != dockToActions.constKeyValueEnd(); ++it) {
auto dockWidget = it->first;
auto actions = it->second;
QSize size = layouts.getReplayPlayAreaWidgetSize(dockWidget->objectName(), actions.defaultSize);
dockWidget->setMinimumSize(size);
dockWidget->setMaximumSize(size);
}
} else { } else {
restoreGeometry(layouts.getGamePlayAreaGeometry()); restoreGeometry(layouts.getGamePlayAreaGeometry());
restoreState(layouts.getGamePlayAreaLayoutState()); restoreState(layouts.getGamePlayAreaLayoutState());
for (auto it = dockToActions.constKeyValueBegin(); it != dockToActions.constKeyValueEnd(); ++it) {
auto dockWidget = it->first;
auto actions = it->second;
QSize size = layouts.getGamePlayAreaWidgetSize(dockWidget->objectName(), actions.defaultSize);
dockWidget->setMinimumSize(size);
dockWidget->setMaximumSize(size);
}
}
QTimer::singleShot(100, this, &TabGame::freeDocksSize);
}
void TabGame::freeDocksSize()
{
for (auto dockWidget : dockToActions.keys()) {
dockWidget->setMinimumSize(100, 100);
dockWidget->setMaximumSize(5000, 5000);
} }
} }
@ -1139,24 +1110,15 @@ void TabGame::actResetLayout()
replayDock->setFloating(false); replayDock->setFloating(false);
addDockWidget(Qt::BottomDockWidgetArea, replayDock); addDockWidget(Qt::BottomDockWidgetArea, replayDock);
cardInfoDock->setMinimumSize(250, 360); cardInfoDock->resize(250, 360);
cardInfoDock->setMaximumSize(250, 360); messageLayoutDock->resize(250, 200);
messageLayoutDock->setMinimumSize(250, 200); playerListDock->resize(250, 50);
messageLayoutDock->setMaximumSize(250, 200); replayDock->resize(900, 100);
playerListDock->setMinimumSize(250, 50);
playerListDock->setMaximumSize(250, 50);
replayDock->setMinimumSize(900, 100);
replayDock->setMaximumSize(900, 100);
} else { } else {
cardInfoDock->setMinimumSize(250, 360); cardInfoDock->resize(250, 360);
cardInfoDock->setMaximumSize(250, 360); messageLayoutDock->resize(250, 250);
messageLayoutDock->setMinimumSize(250, 250); playerListDock->resize(250, 50);
messageLayoutDock->setMaximumSize(250, 250);
playerListDock->setMinimumSize(250, 50);
playerListDock->setMaximumSize(250, 50);
} }
QTimer::singleShot(100, this, &TabGame::freeDocksSize);
} }
void TabGame::createPlayAreaWidget(bool bReplay) void TabGame::createPlayAreaWidget(bool bReplay)
@ -1334,17 +1296,9 @@ void TabGame::hideEvent(QHideEvent *event)
if (replayDock) { if (replayDock) {
layouts.setReplayPlayAreaState(saveState()); layouts.setReplayPlayAreaState(saveState());
layouts.setReplayPlayAreaGeometry(saveGeometry()); layouts.setReplayPlayAreaGeometry(saveGeometry());
for (auto dockWidget : dockToActions.keys()) {
layouts.setReplayPlayAreaWidgetSize(dockWidget->objectName(), dockWidget->size());
}
} else { } else {
layouts.setGamePlayAreaState(saveState()); layouts.setGamePlayAreaState(saveState());
layouts.setGamePlayAreaGeometry(saveGeometry()); layouts.setGamePlayAreaGeometry(saveGeometry());
for (auto dockWidget : dockToActions.keys()) {
layouts.setGamePlayAreaWidgetSize(dockWidget->objectName(), dockWidget->size());
}
} }
Tab::hideEvent(event); Tab::hideEvent(event);

1
cockatrice/src/interface/widgets/tabs/tab_game.h
View file

@ -165,7 +165,6 @@ private slots:
void notifyPlayerKicked(); void notifyPlayerKicked();
void processPlayerLeave(Player *leavingPlayer); void processPlayerLeave(Player *leavingPlayer);
void actResetLayout(); void actResetLayout();
void freeDocksSize();
void hideEvent(QHideEvent *event) override; void hideEvent(QHideEvent *event) override;

24
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -246,15 +246,6 @@ void TabDeckEditorVisual::showPrintingSelector()
printingSelectorDockWidget->setVisible(true); printingSelectorDockWidget->setVisible(true);
} }
/** @brief Set size restrictions for free floating dock widgets. */
void TabDeckEditorVisual::freeDocksSize()
{
for (auto dockWidget : dockToActions.keys()) {
dockWidget->setMinimumSize(100, 100);
dockWidget->setMaximumSize(5000, 5000);
}
}
/** @brief Refreshes keyboard shortcuts for this tab from settings. */ /** @brief Refreshes keyboard shortcuts for this tab from settings. */
void TabDeckEditorVisual::refreshShortcuts() void TabDeckEditorVisual::refreshShortcuts()
{ {
@ -273,17 +264,6 @@ void TabDeckEditorVisual::loadLayout()
restoreState(layoutState); restoreState(layoutState);
restoreGeometry(layouts.getVisualDeckEditorGeometry()); restoreGeometry(layouts.getVisualDeckEditorGeometry());
} }
for (auto it = dockToActions.constKeyValueBegin(); it != dockToActions.constKeyValueEnd(); ++it) {
auto dockWidget = it->first;
auto actions = it->second;
QSize size = layouts.getVisualDeckEditorWidgetSize(dockWidget->objectName(), actions.defaultSize);
dockWidget->setMinimumSize(size);
dockWidget->setMaximumSize(size);
}
QTimer::singleShot(100, this, &TabDeckEditorVisual::freeDocksSize);
} }
/** @brief Resets the layout to default positions and dock states. */ /** @brief Resets the layout to default positions and dock states. */
@ -346,10 +326,6 @@ bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e)
LayoutsSettings &layouts = SettingsCache::instance().layouts(); LayoutsSettings &layouts = SettingsCache::instance().layouts();
layouts.setVisualDeckEditorLayoutState(saveState()); layouts.setVisualDeckEditorLayoutState(saveState());
layouts.setVisualDeckEditorGeometry(saveGeometry()); layouts.setVisualDeckEditorGeometry(saveGeometry());
for (auto dockWidget : dockToActions.keys()) {
layouts.setVisualDeckEditorWidgetSize(dockWidget->objectName(), dockWidget->size());
}
} }
return false; return false;
} }

7
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
View file

@ -66,11 +66,6 @@ protected slots:
*/ */
void restartLayout() override; void restartLayout() override;
/**
* @brief Set size restrictions for free floating dock widgets.
*/
void freeDocksSize() override;
/** /**
* @brief Refresh keyboard shortcuts for this tab. * @brief Refresh keyboard shortcuts for this tab.
*/ */
@ -178,4 +173,4 @@ public slots:
bool actSaveDeckAs() override; bool actSaveDeckAs() override;
}; };
#endif #endif

44
libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
View file

@ -48,17 +48,6 @@ void LayoutsSettings::setDeckEditorGeometry(const QByteArray &value)
setValue(value, GEOMETRY_PROP, GROUP_DECK_EDITOR); setValue(value, GEOMETRY_PROP, GROUP_DECK_EDITOR);
} }
void LayoutsSettings::setDeckEditorWidgetSize(const QString &widgetName, const QSize &value)
{
setValue(value, widgetName, GROUP_DECK_EDITOR, SIZE_PROP);
}
QSize LayoutsSettings::getDeckEditorWidgetSize(const QString &widgetName, const QSize &defaultValue)
{
QVariant previous = getValue(widgetName, GROUP_DECK_EDITOR, SIZE_PROP);
return previous == QVariant() ? defaultValue : previous.toSize();
}
QByteArray LayoutsSettings::getVisualDeckEditorLayoutState() QByteArray LayoutsSettings::getVisualDeckEditorLayoutState()
{ {
return getValue(STATE_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray(); return getValue(STATE_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
@ -79,17 +68,6 @@ void LayoutsSettings::setVisualDeckEditorGeometry(const QByteArray &value)
setValue(value, GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR); setValue(value, GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR);
} }
void LayoutsSettings::setVisualDeckEditorWidgetSize(const QString &widgetName, const QSize &value)
{
setValue(value, widgetName, GROUP_VISUAL_DECK_EDITOR, SIZE_PROP);
}
QSize LayoutsSettings::getVisualDeckEditorWidgetSize(const QString &widgetName, const QSize &defaultValue)
{
QVariant previous = getValue(widgetName, GROUP_VISUAL_DECK_EDITOR, SIZE_PROP);
return previous == QVariant() ? defaultValue : previous.toSize();
}
QByteArray LayoutsSettings::getDeckEditorDbHeaderState() QByteArray LayoutsSettings::getDeckEditorDbHeaderState()
{ {
return getValue(STATE_PROP, GROUP_DECK_EDITOR_DB, "header").toByteArray(); return getValue(STATE_PROP, GROUP_DECK_EDITOR_DB, "header").toByteArray();
@ -150,17 +128,6 @@ QByteArray LayoutsSettings::getGamePlayAreaGeometry()
return getValue(GEOMETRY_PROP, GROUP_GAME_PLAY_AREA).toByteArray(); return getValue(GEOMETRY_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
} }
void LayoutsSettings::setGamePlayAreaWidgetSize(const QString &widgetName, const QSize &value)
{
setValue(value, widgetName, GROUP_GAME_PLAY_AREA, SIZE_PROP);
}
QSize LayoutsSettings::getGamePlayAreaWidgetSize(const QString &widgetName, const QSize &defaultValue)
{
QVariant previous = getValue(widgetName, GROUP_GAME_PLAY_AREA, SIZE_PROP);
return previous == QVariant() ? defaultValue : previous.toSize();
}
void LayoutsSettings::setReplayPlayAreaGeometry(const QByteArray &value) void LayoutsSettings::setReplayPlayAreaGeometry(const QByteArray &value)
{ {
setValue(value, GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA); setValue(value, GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA);
@ -180,14 +147,3 @@ QByteArray LayoutsSettings::getReplayPlayAreaGeometry()
{ {
return getValue(GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA).toByteArray(); return getValue(GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA).toByteArray();
} }
void LayoutsSettings::setReplayPlayAreaWidgetSize(const QString &widgetName, const QSize &value)
{
setValue(value, widgetName, GROUP_REPLAY_PLAY_AREA, SIZE_PROP);
}
QSize LayoutsSettings::getReplayPlayAreaWidgetSize(const QString &widgetName, const QSize &defaultValue)
{
QVariant previous = getValue(widgetName, GROUP_REPLAY_PLAY_AREA, SIZE_PROP);
return previous == QVariant() ? defaultValue : previous.toSize();
}

8
libcockatrice_settings/libcockatrice/settings/layouts_settings.h
View file

@ -21,11 +21,9 @@ public:
void setDeckEditorLayoutState(const QByteArray &value); void setDeckEditorLayoutState(const QByteArray &value);
void setDeckEditorGeometry(const QByteArray &value); void setDeckEditorGeometry(const QByteArray &value);
void setDeckEditorWidgetSize(const QString &widgetName, const QSize &value);
void setVisualDeckEditorLayoutState(const QByteArray &value); void setVisualDeckEditorLayoutState(const QByteArray &value);
void setVisualDeckEditorGeometry(const QByteArray &value); void setVisualDeckEditorGeometry(const QByteArray &value);
void setVisualDeckEditorWidgetSize(const QString &widgetName, const QSize &value);
void setDeckEditorDbHeaderState(const QByteArray &value); void setDeckEditorDbHeaderState(const QByteArray &value);
void setSetsDialogHeaderState(const QByteArray &value); void setSetsDialogHeaderState(const QByteArray &value);
@ -34,21 +32,17 @@ public:
void setGamePlayAreaGeometry(const QByteArray &value); void setGamePlayAreaGeometry(const QByteArray &value);
void setGamePlayAreaState(const QByteArray &value); void setGamePlayAreaState(const QByteArray &value);
void setGamePlayAreaWidgetSize(const QString &widgetName, const QSize &value);
void setReplayPlayAreaGeometry(const QByteArray &value); void setReplayPlayAreaGeometry(const QByteArray &value);
void setReplayPlayAreaState(const QByteArray &value); void setReplayPlayAreaState(const QByteArray &value);
void setReplayPlayAreaWidgetSize(const QString &widgetName, const QSize &value);
QByteArray getMainWindowGeometry(); QByteArray getMainWindowGeometry();
QByteArray getDeckEditorLayoutState(); QByteArray getDeckEditorLayoutState();
QByteArray getDeckEditorGeometry(); QByteArray getDeckEditorGeometry();
QSize getDeckEditorWidgetSize(const QString &widgetName, const QSize &defaultValue = {});
QByteArray getVisualDeckEditorLayoutState(); QByteArray getVisualDeckEditorLayoutState();
QByteArray getVisualDeckEditorGeometry(); QByteArray getVisualDeckEditorGeometry();
QSize getVisualDeckEditorWidgetSize(const QString &widgetName, const QSize &defaultValue = {});
QByteArray getDeckEditorDbHeaderState(); QByteArray getDeckEditorDbHeaderState();
QByteArray getSetsDialogHeaderState(); QByteArray getSetsDialogHeaderState();
@ -57,11 +51,9 @@ public:
QByteArray getGamePlayAreaLayoutState(); QByteArray getGamePlayAreaLayoutState();
QByteArray getGamePlayAreaGeometry(); QByteArray getGamePlayAreaGeometry();
QSize getGamePlayAreaWidgetSize(const QString &widgetName, const QSize &defaultValue = {});
QByteArray getReplayPlayAreaLayoutState(); QByteArray getReplayPlayAreaLayoutState();
QByteArray getReplayPlayAreaGeometry(); QByteArray getReplayPlayAreaGeometry();
QSize getReplayPlayAreaWidgetSize(const QString &widgetName, const QSize &defaultValue = {});
signals: signals:
public slots: public slots: