blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-29 21:00:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only restore geometry on first show, not restore from minimize

Browse source
This commit is contained in:
Dan Paulat 2025-08-28 18:30:23 -05:00
parent de43670ec2
commit 3c5c9ea27e
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -463,18 +463,28 @@ void MainWindow::keyReleaseEvent(QKeyEvent* ev)
void MainWindow::showEvent(QShowEvent* event) void MainWindow::showEvent(QShowEvent* event)
{ {
QMainWindow::showEvent(event); QMainWindow::showEvent(event);
auto& uiSettings = settings::UiSettings::Instance();
// restore the geometry state static bool firstShowEvent = true;
std::string uiGeometry = uiSettings.main_ui_geometry().GetValue(); bool restored = false;
restoreGeometry(
QByteArray::fromBase64(QByteArray::fromStdString(uiGeometry)));
// restore the UI state if (firstShowEvent)
std::string uiState = uiSettings.main_ui_state().GetValue(); {
auto& uiSettings = settings::UiSettings::Instance();
// restore the geometry state
std::string uiGeometry = uiSettings.main_ui_geometry().GetValue();
restoreGeometry(
QByteArray::fromBase64(QByteArray::fromStdString(uiGeometry)));
// restore the UI state
std::string uiState = uiSettings.main_ui_state().GetValue();
restored = restoreState(
QByteArray::fromBase64(QByteArray::fromStdString(uiState)));
firstShowEvent = false;
}
bool restored =
restoreState(QByteArray::fromBase64(QByteArray::fromStdString(uiState)));
if (!restored) if (!restored)
{ {
resizeDocks({ui->radarToolboxDock}, {194}, Qt::Horizontal); resizeDocks({ui->radarToolboxDock}, {194}, Qt::Horizontal);