Skip to content

Fix subwindow size limits (MainWindow::restoreWidgetState) #8204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yohannd1 wants to merge 9 commits into
base: master
Choose a base branch
from
+13 −25
Open

Fix subwindow size limits (MainWindow::restoreWidgetState) #8204

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b165f1c
remove restraint against negative positions in MainWindow::restoreWid…
yohannd1 Jan 10, 2026
72b1124
correct minimum size + update style
yohannd1 Feb 16, 2026
3e568da
use subwindow minimumSizeHint if possible
yohannd1 Feb 16, 2026
08f1501
Merge remote-tracking branch 'upstream/master' into fix/workspace-neg…
yohannd1 Feb 27, 2026
ddf3286
Update src/gui/MainWindow.cpp
yohannd1 Mar 1, 2026
15b330a
simplify minimum-size logic
yohannd1 Mar 2, 2026
52cfb72
more simplifying
yohannd1 Mar 2, 2026
0a69dc4
slightly better comment...
yohannd1 Mar 2, 2026
ee7e41d
improve comment
yohannd1 May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions src/gui/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,6 @@ void MainWindow::saveWidgetState(QWidget* w, QDomElement& de)
de.setAttribute("height", normalGeometry.height());
}




void MainWindow::restoreWidgetState(QWidget* w, const QDomElement& de)
{
// TODO: Only use one of these
Expand All @@ -697,44 +694,36 @@ void MainWindow::restoreWidgetState(QWidget* w, const QDomElement& de)
{
// Fall back on parent
win = qobject_cast<SubWindow*>(w->parentWidget());
if (!win)
{
// Still could not find the window - soft fail
return;
}

// Still could not find the window - soft fail
if (!win) { return; }
}

const auto normalGeometry = QRect {
const auto normalGeometry = QRect{
de.attribute("x").toInt(),
de.attribute("y").toInt(),
de.attribute("width").toInt(),
de.attribute("height").toInt()
de.attribute("height").toInt(),
};

if (normalGeometry.isValid())
{
// first restore the window, as attempting to resize a maximized window causes graphics glitching
win->setWindowState(win->windowState() & ~(Qt::WindowMaximized | Qt::WindowMinimized));
// First restore the window, as attempting to resize a maximized window can cause graphical glitches.
win->setWindowState(win->windowState() & ~(Qt::WindowMaximized | Qt::WindowMinimized));

win->setGeometry(normalGeometry);
// Then resize it. Previously present validity checks are not needed anymore and taken into account by
// `QWidget::setGeometry`.
win->setGeometry(normalGeometry);

// set the window to its correct minimized/maximized/restored state
Qt::WindowStates winState = win->windowState();
winState = de.attribute("maximized").toInt()
? (winState | Qt::WindowMaximized)
: (winState & ~Qt::WindowMaximized);
win->setWindowState(winState);
}
// Set the window to its correct "maximized?" state.
auto winState = win->windowState();
winState.setFlag(Qt::WindowMaximized, de.attribute("maximized").toInt());
win->setWindowState(winState);

if (const auto visible = de.attribute("visible"); !visible.isEmpty())
{
win->setVisible(visible.toInt());
}
}




void MainWindow::emptySlot()
{
}
Expand Down
Loading