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

Merge pull request #502 from dpaulat/hotfix/restore-from-minimize

Browse source 
Only restore geometry on first show, not restore from minimize
This commit is contained in:
Dan Paulat 2025-08-30 15:00:00 -05:00 • committed by GitHub
commit df0d698837
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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)
{
QMainWindow::showEvent(event);
auto& uiSettings = settings::UiSettings::Instance();
// restore the geometry state
std::string uiGeometry = uiSettings.main_ui_geometry().GetValue();
restoreGeometry(
QByteArray::fromBase64(QByteArray::fromStdString(uiGeometry)));
static bool firstShowEvent = true;
bool restored = false;
// restore the UI state
std::string uiState = uiSettings.main_ui_state().GetValue();
if (firstShowEvent)
{
auto& uiSettings = settings::UiSettings::Instance();
// restore the geometry state
const std::string uiGeometry = uiSettings.main_ui_geometry().GetValue();
restoreGeometry(
QByteArray::fromBase64(QByteArray::fromStdString(uiGeometry)));
// restore the UI state
const 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)
{
resizeDocks({ui->radarToolboxDock}, {194}, Qt::Horizontal);