Remember Popped-up Chat Size

selected

@@ -0,0 +1 @@
+lib/settings/tests/files/advanced-window.json

src/common/ChatterinoSetting.hpp

@@ -4,6 +4,7 @@
 
 #include <pajlada/settings.hpp>
 #include <QString>
+#include <QSize>
 
 namespace chatterino {
 
@@ -55,6 +56,7 @@ using DoubleSetting = ChatterinoSetting<double>;
 using IntSetting = ChatterinoSetting<int>;
 using StringSetting = ChatterinoSetting<std::string>;
 using QStringSetting = ChatterinoSetting<QString>;
+using QSizeSetting = ChatterinoSetting<QSize>;
 
 template <typename Enum>
 class EnumSetting

src/singletons/Settings.hpp

@@ -212,6 +212,8 @@ class Settings
     BoolSetting useCustomFfzVipBadges = {
         "/appearance/badges/useCustomFfzVipBadges", true};
     BoolSetting showBadgesSevenTV = {"/appearance/badges/seventv", true};
+    ChatterinoSetting<QSize> lastPopupSetting = {"/appearance/lastPopup",
+                                                 {300, 500}};
 
     /// Behaviour
     BoolSetting allowDuplicateMessages = {"/behaviour/allowDuplicateMessages",

src/util/RapidJsonSerializeQSize.hpp

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <pajlada/serialize.hpp>
+#include <QSize>
+
+namespace pajlada {
+
+template <>
+struct Serialize<QSize> {
+    static rapidjson::Value get(const QSize &value,
+                                rapidjson::Document::AllocatorType &a)
+    {
+        rapidjson::Value ret(rapidjson::kObjectType);
+
+        chatterino::rj::set(ret, "width", value.width(), a);
+        chatterino::rj::set(ret, "height", value.height(), a);
+
+        return ret;
+    }
+};
+
+template <>
+struct Deserialize<QSize> {
+    static QSize get(const rapidjson::Value &value, bool *error = nullptr)
+    {
+        if (!value.IsObject())
+        {
+            PAJLADA_REPORT_ERROR(error);
+            return QSize{};
+        }
+
+        int _width;
+        int _height;
+
+        chatterino::rj::getSafe(value, "width", _width);
+        chatterino::rj::getSafe(value, "height", _height);
+
+        return QSize(_width, _height);
+    }
+};
+
+}  // namespace pajlada

src/widgets/Window.cpp

@@ -18,6 +18,7 @@
 #include "singletons/Updates.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/InitUpdateButton.hpp"
+#include "util/RapidJsonSerializeQSize.hpp"
 #include "widgets/AccountSwitchPopup.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/dialogs/switcher/QuickSwitcherPopup.hpp"
@@ -75,7 +76,8 @@ Window::Window(WindowType type, QWidget *parent)
     }
     else
     {
-        this->resize(int(300 * this->scale()), int(500 * this->scale()));
+        auto lastPopup = getSettings()->lastPopupSetting.getValue();
+        this->resize(lastPopup.width(), lastPopup.height());
     }
 
     this->signalHolder_.managedConnect(getApp()->getHotkeys()->onItemsUpdated,
@@ -148,7 +150,12 @@ void Window::closeEvent(QCloseEvent *)
         getApp()->getWindows()->save();
         getApp()->getWindows()->closeAll();
     }
-
+    else
+    {
+        QRect rect = this->getBounds();
+        QSize newSize(rect.width(), rect.height());
+        getSettings()->lastPopupSetting.setValue(newSize);
+    }
     // Ensure selectedWindow_ is never an invalid pointer.
     // WindowManager will return the main window if no window is pointed to by
     // `selectedWindow_`.