Hello June

Author: nlogozzo

.github/workflows/windows.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           pkgs: libnick qtbase qtsvg qttools qlementine qlementine-icons
           triplet: x64-windows
-          revision: 8f54ef5453e7e76ff01e15988bf243e7247c5eb5
+          revision: 9d4e97b8ad492f35c63de3c3f069d9290da00741
           token: ${{ github.token }}
           github-binarycache: true
       - name: "Build"

flatpak/org.nickvision.application.gnome.json

@@ -62,7 +62,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/nickvisionapps/libnick",
-                    "tag": "2025.5.3"
+                    "tag": "2025.6.0"
                 }
             ]
         },

flatpak/org.nickvision.application.qt.json

@@ -79,7 +79,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/nickvisionapps/libnick",
-                    "tag": "2025.5.3"
+                    "tag": "2025.6.0"
                 }
             ]
         },

inno/setup.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "Nickvision Application"
 #define MyAppShortName "Application"
-#define MyAppVersion "2025.5.0"
+#define MyAppVersion "2025.6.0"
 #define MyAppPublisher "Nickvision"
 #define MyAppURL "https://nickvision.org"
 #define MyAppExeName "org.nickvision.application.qt.exe"

libapplication/src/controllers/mainwindowcontroller.cpp

@@ -25,7 +25,7 @@ namespace Nickvision::Application::Shared::Controllers
         m_appInfo{ "org.nickvision.application", "Nickvision Application", "Application" },
         m_dataFileManager{ m_appInfo.getName() }
     {
-        m_appInfo.setVersion({ "2025.5.0-next" });
+        m_appInfo.setVersion({ "2025.6.0-next" });
         m_appInfo.setShortName(_("Application"));
         m_appInfo.setDescription(_("Create new Nickvision applications"));
         m_appInfo.setChangelog("- Initial Release");

libapplication/src/models/configuration.cpp

@@ -24,28 +24,16 @@ namespace Nickvision::Application::Shared::Models
 
     WindowGeometry Configuration::getWindowGeometry() const
     {
-        WindowGeometry geometry;
         if(!m_json["WindowGeometry"].is_object())
         {
-            geometry.setWidth(800);
-            geometry.setHeight(600);
-            geometry.setIsMaximized(false);
-            return geometry;
+            return { 800, 600, false };
         }
-        boost::json::object& obj{ m_json["WindowGeometry"].as_object() };
-        geometry.setWidth(obj["Width"].is_int64() ? static_cast<long>(obj["Width"].as_int64()) : 800);
-        geometry.setHeight(obj["Height"].is_int64() ? static_cast<long>(obj["Height"].as_int64()) : 600);
-        geometry.setIsMaximized(obj["IsMaximized"].is_bool() ? obj["IsMaximized"].as_bool() : false);
-        return geometry;
+        return WindowGeometry(m_json["WindowGeometry"].as_object());
     }
 
     void Configuration::setWindowGeometry(const WindowGeometry& geometry)
     {
-        boost::json::object obj;
-        obj["Width"] = geometry.getWidth();
-        obj["Height"] = geometry.getHeight();
-        obj["IsMaximized"] = geometry.isMaximized();
-        m_json["WindowGeometry"] = obj;
+        m_json["WindowGeometry"] = geometry.toJson();
     }
 
     bool Configuration::getAutomaticallyCheckForUpdates() const
@@ -57,4 +45,4 @@ namespace Nickvision::Application::Shared::Models
     {
         m_json["AutomaticallyCheckForUpdates"] = check;
     }
-}
+}

org.nickvision.application.gnome/blueprints/main_window.blp

@@ -10,6 +10,8 @@ menu mainMenu {
 Adw.ApplicationWindow root {
   width-request: 360;
   height-request: 200;
+  default-width: 800;
+  default-height: 600;
 
   Adw.ToolbarView toolbarView {
     [top]

org.nickvision.application.gnome/src/views/mainwindow.cpp

@@ -85,11 +85,14 @@ namespace Nickvision::Application::GNOME::Views
 #else
         const StartupInformation& info{ m_controller->startup() };
 #endif
-        gtk_window_set_default_size(GTK_WINDOW(m_window), static_cast<int>(info.getWindowGeometry().getWidth()), static_cast<int>(info.getWindowGeometry().getHeight()));
         if(info.getWindowGeometry().isMaximized())
         {
             gtk_window_maximize(GTK_WINDOW(m_window));
         }
+        else
+        {
+            gtk_window_set_default_size(GTK_WINDOW(m_window), static_cast<int>(info.getWindowGeometry().getWidth()), static_cast<int>(info.getWindowGeometry().getHeight()));
+        }
     }
 
     bool MainWindow::onCloseRequested()

org.nickvision.application.qt/src/views/mainwindow.cpp

@@ -179,11 +179,18 @@ namespace Nickvision::Application::Qt::Views
 #else
         const StartupInformation& info{ m_controller->startup() };
 #endif
-        setGeometry(QWidget::geometry().x(), QWidget::geometry().y(), info.getWindowGeometry().getWidth(), info.getWindowGeometry().getHeight());
         if(info.getWindowGeometry().isMaximized())
         {
             showMaximized();
         }
+        else
+        {
+#ifdef _WIN32
+            info.getWindowGeometry().apply(reinterpret_cast<HWND>(winId()));
+#else
+            setGeometry(QWidget::geometry().x(), QWidget::geometry().y(), info.getWindowGeometry().getWidth(), info.getWindowGeometry().getHeight());
+#endif
+        }
     }
 
     void MainWindow::closeEvent(QCloseEvent* event)
@@ -192,7 +199,11 @@ namespace Nickvision::Application::Qt::Views
         {
             return event->ignore();
         }
+#ifdef _WIN32
+        m_controller->shutdown({ reinterpret_cast<HWND>(winId()) });
+#else
         m_controller->shutdown({ geometry().width(), geometry().height(), isMaximized() });
+#endif
         event->accept();
     }
 

resources/linux/org.nickvision.application.metainfo.xml.in

@@ -51,7 +51,7 @@
   </requires>
   <!-- The release description fields support markup list syntax (`<ul><li>[…]</li></ul>`) -->
   <releases>
-    <release version="2025.5.0-next" date="2025-05-01">
+    <release version="2025.6.0-next" date="2025-06-01">
       <description translate="no">
         <p>- Initial Release</p>
       </description>