diff --git a/lib/settings b/lib/settings index 1282c351d..d3faa9b39 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 1282c351db528f9e2f166b2bb1c217c9d67a8bc8 +Subproject commit d3faa9b3996e0871473b0e2b1821c93a50821f40 diff --git a/src/widgets/mainwindow.cpp b/src/widgets/mainwindow.cpp index 99c5bce26..c7daded08 100644 --- a/src/widgets/mainwindow.cpp +++ b/src/widgets/mainwindow.cpp @@ -26,7 +26,7 @@ MainWindow::MainWindow(ChannelManager &_channelManager, ColorScheme &_colorSchem , colorScheme(_colorScheme) , completionManager(_completionManager) , notebook(this->channelManager, this) - , windowGeometry("/windows/0/geometry") + // , windowGeometry("/windows/0/geometry") { QVBoxLayout *layout = new QVBoxLayout(this); @@ -47,9 +47,9 @@ MainWindow::MainWindow(ChannelManager &_channelManager, ColorScheme &_colorSchem this->refreshTheme(); - if (this->windowGeometry->isFilled()) { + if (/*this->windowGeometry->isFilled()*/ false) { // Load geometry from settings file - this->setGeometry(this->windowGeometry.getValueRef()); + // this->setGeometry(this->windowGeometry.getValueRef()); } else { // Set default geometry // Default position is in the middle of the current monitor or the primary monitor @@ -163,7 +163,7 @@ Notebook &MainWindow::getNotebook() void MainWindow::closeEvent(QCloseEvent *) { // Save closing window position - this->windowGeometry = this->geometry(); + // this->windowGeometry = this->geometry(); } void MainWindow::refreshTheme() diff --git a/src/widgets/mainwindow.hpp b/src/widgets/mainwindow.hpp index 37decd0fa..e609aac29 100644 --- a/src/widgets/mainwindow.hpp +++ b/src/widgets/mainwindow.hpp @@ -56,6 +56,7 @@ private: bool loaded = false; TitleBar titleBar; + /* class QRectWrapper : public pajlada::Settings::ISettingData, public QRect { public: @@ -66,14 +67,6 @@ private: pajlada::Signals::Signal valueChanged; - /* - operator const QRect &() const - { - return static_cast(*this); - // return this->getValue(); - } - */ - const QRectWrapper &getValueRef() const { return *this; @@ -145,8 +138,9 @@ private: static_cast(*this) = rhs; } }; + */ - pajlada::Settings::Setting windowGeometry; + //pajlada::Settings::Setting windowGeometry; friend class Notebook; };