changing config value will change the size/position of the output window

Author: jw098

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp

@@ -130,16 +130,16 @@ GlobalSettings::GlobalSettings()
     , THEME(CONSTRUCT_TOKEN)
     , WINDOW_SIZE(
         CONSTRUCT_TOKEN,
-        "Window Size:",
-        "Set the size of the window. Takes effect immediately.<br>"
+        "Window Size/Position:",
+        "Set the size/position of the window. Takes effect immediately.<br>"
         "Use this to easily set the window to a specific resolution for streaming alignment.",
         1280, 1000,
         0, 0
     )
     , LOG_WINDOW_SIZE(
         CONSTRUCT_TOKEN,
-        "Output Window Size:",
-        "Set the initial size of the output window. Takes effect after restart.<br>",
+        "Output Window Size/Position:",
+        "Set the size/position of the output window. Takes effect immediately.<br>",
         600, 1200,
         0, 0
     )

SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.cpp

@@ -11,6 +11,7 @@
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Windows/DpiScaler.h"
 #include "CommonFramework/Windows/WindowTracker.h"
+#include "CommonFramework/Windows/MainWindow.h"
 #include "CommonFramework/Options/ResolutionOption.h"
 #include "FileWindowLogger.h"
 
@@ -240,6 +241,11 @@ FileWindowLoggerWindow::FileWindowLoggerWindow(FileWindowLogger& logger, QWidget
         }
     );
 
+    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH.add_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT.add_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS.add_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS.add_listener(*this);  
+
     m_logger += *this;
     log("================================================================================");
     log("<b>Window Startup...</b>");
@@ -252,6 +258,10 @@ FileWindowLoggerWindow::FileWindowLoggerWindow(FileWindowLogger& logger, QWidget
 FileWindowLoggerWindow::~FileWindowLoggerWindow(){
     remove_window(*this);
     m_logger -= *this;
+    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH.remove_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT.remove_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS.remove_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS.remove_listener(*this);      
 }
 
 void FileWindowLoggerWindow::log(QString msg){
@@ -260,15 +270,39 @@ 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){
+    m_pending_move = true;    
     GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS.set(x());
     GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS.set(y());
+    m_pending_move = false;
+}
+
+void FileWindowLoggerWindow::on_config_value_changed(void* object){
+    if (object == &GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH || object == &GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT){
+        QMetaObject::invokeMethod(this, [this]{
+            if (!m_pending_resize){
+                resize(
+                    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH,
+                    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT
+                );
+            }
+        });
+    }else if (object == &GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS || object == &GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS){
+        QMetaObject::invokeMethod(this, [this]{
+            if (!m_pending_move){
+                move(
+                    move_x_within_screen_bounds(GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS),
+                    move_y_within_screen_bounds(GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS)
+                );
+            }
+        });        
+    }
 }
 
 

SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.h

@@ -16,6 +16,7 @@
 #include <QTextEdit>
 #include <QMainWindow>
 #include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Options/ConfigOption.h"
 //#include "Common/Cpp/LifetimeSanitizer.h"
 
 namespace PokemonAutomation{
@@ -72,7 +73,7 @@ class FileWindowLogger : public Logger{
 };
 
 
-class FileWindowLoggerWindow : public QMainWindow{
+class FileWindowLoggerWindow : public QMainWindow, public ConfigOption::Listener{
     Q_OBJECT
 
 public:
@@ -87,10 +88,12 @@ class FileWindowLoggerWindow : public QMainWindow{
     void signal_log(QString msg);
 
 private:
+    virtual void on_config_value_changed(void* object) override;
     FileWindowLogger& m_logger;
     QMenuBar* m_menubar;
     QTextEdit* m_text;
-    // bool m_pending_resize = false;
+    bool m_pending_resize = false;
+    bool m_pending_move = false;
 };
 
 

SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp

@@ -20,16 +20,14 @@ ResolutionOption::ResolutionOption(
     , DESCRIPTION(std::move(description))
     , WIDTH("<b>Width:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_width(default_width))
     , HEIGHT("<b>Height:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_height(default_height))
-    , X_POS("<b>X position:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_width(initial_x_pos))
-    , Y_POS("<b>Y position:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_height(initial_y_pos))
+    , X_POS("<b>X-position:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_width(initial_x_pos))
+    , Y_POS("<b>Y-position:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_height(initial_y_pos))
 {
     PA_ADD_STATIC(DESCRIPTION);
     PA_ADD_OPTION(WIDTH);
     PA_ADD_OPTION(HEIGHT);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(X_POS);
-        PA_ADD_OPTION(Y_POS);
-    }
+    PA_ADD_OPTION(X_POS);
+    PA_ADD_OPTION(Y_POS);
 }