Save X/Y position of window, so that it will re-open at that position. Fix bug with re-opening the Output window.

Author: jw098

SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.cpp

@@ -260,12 +260,16 @@ void FileWindowLoggerWindow::log(QString msg){
 }
 
 void FileWindowLoggerWindow::resizeEvent(QResizeEvent* event){
-    m_pending_resize = true;
+    // m_pending_resize = true;
     GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH.set(width());
     GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT.set(height());
-    m_pending_resize = false;
+    // m_pending_resize = false;
 }
 
+void FileWindowLoggerWindow::moveEvent(QMoveEvent* event){
+    GlobalSettings::instance().LOG_WINDOW_SIZE->INITIAL_X_POS.set(x());
+    GlobalSettings::instance().LOG_WINDOW_SIZE->INITIAL_Y_POS.set(y());
+}
 
 
 

SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.h

@@ -81,6 +81,7 @@ class FileWindowLoggerWindow : public QMainWindow{
 
     void log(QString msg);
     virtual void resizeEvent(QResizeEvent* event) override;
+    virtual void moveEvent(QMoveEvent* event) override;
 
 signals:
     void signal_log(QString msg);
@@ -89,7 +90,7 @@ class FileWindowLoggerWindow : public QMainWindow{
     FileWindowLogger& m_logger;
     QMenuBar* m_menubar;
     QTextEdit* m_text;
-    bool m_pending_resize = false;
+    // bool m_pending_resize = false;
 };
 
 

SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp

@@ -26,7 +26,7 @@ ResolutionOption::ResolutionOption(
     PA_ADD_STATIC(DESCRIPTION);
     PA_ADD_OPTION(WIDTH);
     PA_ADD_OPTION(HEIGHT);
-    if (PreloadSettings::instance().DEVELOPER_MODE){    
+    if (PreloadSettings::instance().DEVELOPER_MODE){
         PA_ADD_OPTION(INITIAL_X_POS);
         PA_ADD_OPTION(INITIAL_Y_POS);
     }

SerialPrograms/Source/CommonFramework/Options/ResolutionOption.h

@@ -25,8 +25,8 @@ class ResolutionOption : public GroupOption{
     StaticTextOption DESCRIPTION;
     SimpleIntegerOption<uint32_t> WIDTH;
     SimpleIntegerOption<uint32_t> HEIGHT;
-    SimpleIntegerOption<uint32_t> INITIAL_X_POS;
-    SimpleIntegerOption<uint32_t> INITIAL_Y_POS;
+    SimpleIntegerOption<int32_t> INITIAL_X_POS;
+    SimpleIntegerOption<int32_t> INITIAL_Y_POS;
 };
 
 

SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp

@@ -27,9 +27,9 @@
 #include "MainWindow.h"
 
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+#include <iostream>
+using std::cout;
+using std::endl;
 
 namespace PokemonAutomation{
 
@@ -212,25 +212,26 @@ MainWindow::MainWindow(QWidget* parent)
         m_output_window.reset(new FileWindowLoggerWindow((FileWindowLogger&)global_logger_raw()));
         QPushButton* output = new QPushButton("Output Window", support_box);
         buttons->addWidget(output);
-        auto show_output_window = [&](){
-            m_output_window->show();
-            m_output_window->raise(); // bring the window to front on macOS
-            m_output_window->activateWindow(); // bring the window to front on Windows
-        };        
         connect(
             output, &QPushButton::clicked,
             this, [&](bool){
-                show_output_window();
+                m_output_window->show();
+                m_output_window->raise(); // bring the window to front on macOS
+                m_output_window->activateWindow(); // bring the window to front on Windows
             }
         );
+        // get snapshot of the saved initial x/y position, since activating the window seems to change the window coordinates, 
+        // which then causes initial x/y position to change, due to triggering moveEvent().
+        uint32_t initial_x_pos_log = GlobalSettings::instance().LOG_WINDOW_SIZE->INITIAL_X_POS;
+        uint32_t initial_y_pos_log = GlobalSettings::instance().LOG_WINDOW_SIZE->INITIAL_Y_POS;    
 
         if (GlobalSettings::instance().LOG_WINDOW_STARTUP){ // show the Output Window on startup
-            show_output_window();
+            m_output_window->show();
+            m_output_window->raise(); // bring the window to front on macOS
+            m_output_window->activateWindow(); // bring the window to front on Windows
         }
 
         // move the output window to desired position on startup
-        uint32_t initial_x_pos_log = GlobalSettings::instance().LOG_WINDOW_SIZE->INITIAL_X_POS;
-        uint32_t initial_y_pos_log = GlobalSettings::instance().LOG_WINDOW_SIZE->INITIAL_Y_POS;             
         uint32_t move_x_log = std::min(initial_x_pos_log, screen_width-100);
         uint32_t move_y_log = std::min(initial_y_pos_log, screen_height-100);
         m_output_window->move(scale_dpi_width(move_x_log), scale_dpi_height(move_y_log));
@@ -281,6 +282,11 @@ void MainWindow::resizeEvent(QResizeEvent* event){
     m_pending_resize = false;
 }
 
+void MainWindow::moveEvent(QMoveEvent* event){
+    GlobalSettings::instance().WINDOW_SIZE->INITIAL_X_POS.set(x());
+    GlobalSettings::instance().WINDOW_SIZE->INITIAL_Y_POS.set(y());
+}
+
 void MainWindow::close_panel() noexcept{
 //    cout << "close_panel(): enter: " << m_current_panel_widget << endl;
     //  Must destroy the widget first since it references the instance.

SerialPrograms/Source/CommonFramework/Windows/MainWindow.h

@@ -37,6 +37,7 @@ class MainWindow :
 private:
     virtual void closeEvent(QCloseEvent* event) override;
     virtual void resizeEvent(QResizeEvent* event) override;
+    virtual void moveEvent(QMoveEvent* event) override;
 
     void close_panel() noexcept;