smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Mainwindow can not start off screen

Browse source 
Fixes #7451
This commit is contained in:
sithlord48 2024-12-05 14:36:46 -05:00 committed by Chris Rizzitello
parent 6a816350c1
commit ddb443b550
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui/src/MainWindow.cpp
View file

@ -101,7 +101,6 @@ MainWindow::~MainWindow()
void MainWindow::restoreWindow() void MainWindow::restoreWindow()
{ {
const auto &windowSize = m_AppConfig.mainWindowSize(); const auto &windowSize = m_AppConfig.mainWindowSize();
if (windowSize.has_value()) { if (windowSize.has_value()) {
qDebug("restoring main window size"); qDebug("restoring main window size");
@ -110,8 +109,23 @@ void MainWindow::restoreWindow()
const auto &windowPosition = m_AppConfig.mainWindowPosition(); const auto &windowPosition = m_AppConfig.mainWindowPosition();
if (windowPosition.has_value()) { if (windowPosition.has_value()) {
qDebug("restoring main window position"); int x = 0;
move(windowPosition.value()); int y = 0;
int w = 0;
int h = 0;
for (auto screen : QGuiApplication::screens()) {
auto geo = screen->geometry();
x = std::min(geo.x(), x);
y = std::min(geo.y(), y);
w = std::max(geo.x() + geo.width(), w);
h = std::max(geo.y() + geo.height(), h);
}
const QSize totalScreenSize(w, h);
const QPoint point = windowPosition.value();
if (point.x() < totalScreenSize.width() && point.y() < totalScreenSize.height()) {
qDebug("restoring main window position");
move(point);
}
} else { } else {
// center main window in middle of screen // center main window in middle of screen
const auto screen = QGuiApplication::primaryScreen(); const auto screen = QGuiApplication::primaryScreen();