Showing the changes to interface/src/MainWindow.cpp (1 of 14 files). Show all
Unified · Split
| @@ -18,24 +18,20 @@ · 17 unmodified lines | |||
| 18 | #include <QHideEvent> | 18 | #include <QHideEvent> |
| 19 | #include <QWindowStateChangeEvent> | 19 | #include <QWindowStateChangeEvent> |
| 20 | 20 | ||
| 21 | #include <Settings.h> | ||
| 22 | |||
| 23 | #include "MainWindow.h" | 21 | #include "MainWindow.h" |
| 24 | #include "Menu.h" | 22 | #include "Menu.h" |
| 25 | #include "Util.h" | 23 | #include "Util.h" |
| 26 | 24 | ||
| 27 | namespace SettingHandles { | 25 | MainWindow::MainWindow(QWidget* parent) : |
| 28 | const SettingHandle<QRect> windowGeometry("WindowGeometry"); | 26 | QMainWindow(parent), |
| 29 | } | 27 | _windowGeometry("WindowGeometry") |
| 30 | 28 | { | |
| 31 | |||
| 32 | MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) { | ||
| 33 | } | 29 | } |
| 34 | 30 | ||
| 35 | void MainWindow::restoreGeometry() { | 31 | void MainWindow::restoreGeometry() { |
| 36 | // Did not use setGeometry() on purpose, | 32 | // Did not use setGeometry() on purpose, |
| 37 | // see http://doc.qt.io/qt-5/qsettings.html#restoring-the-state-of-a-gui-application | 33 | // see http://doc.qt.io/qt-5/qsettings.html#restoring-the-state-of-a-gui-application |
| 38 | QRect geometry = SettingHandles::windowGeometry.get(qApp->desktop()->availableGeometry()); | 34 | QRect geometry = _windowGeometry.get(qApp->desktop()->availableGeometry()); |
| 39 | move(geometry.topLeft()); | 35 | move(geometry.topLeft()); |
| 40 | resize(geometry.size()); | 36 | resize(geometry.size()); |
| 41 | } | 37 | } |
| @@ -44,7 +40,7 @@ void MainWindow::saveGeometry() { · 2 unmodified lines | |||
| 44 | // Did not use geometry() on purpose, | 40 | // Did not use geometry() on purpose, |
| 45 | // see http://doc.qt.io/qt-5/qsettings.html#restoring-the-state-of-a-gui-application | 41 | // see http://doc.qt.io/qt-5/qsettings.html#restoring-the-state-of-a-gui-application |
| 46 | QRect geometry(pos(), size()); | 42 | QRect geometry(pos(), size()); |
| 47 | SettingHandles::windowGeometry.set(geometry); | 43 | _windowGeometry.set(geometry); |
| 48 | } | 44 | } |
| 49 | 45 | ||
| 50 | void MainWindow::moveEvent(QMoveEvent* event) { | 46 | void MainWindow::moveEvent(QMoveEvent* event) { |