V2025.6.1

Author: nlogozzo

.github/workflows/linux.yml

@@ -31,8 +31,8 @@ jobs:
           xdg-user-dirs-gtk-update
           sudo locale-gen en_US.UTF-8
           sudo update-locale LANG=en_US.UTF-8
-          sudo update-alternatives --install /usr/bin/gcc gcc /home/linuxbrew/.linuxbrew/bin/gcc-14 100
-          sudo update-alternatives --install /usr/bin/g++ g++ /home/linuxbrew/.linuxbrew/bin/g++-14 100
+          sudo update-alternatives --install /usr/bin/gcc gcc /home/linuxbrew/.linuxbrew/bin/gcc-15 100
+          sudo update-alternatives --install /usr/bin/g++ g++ /home/linuxbrew/.linuxbrew/bin/g++-15 100
           sudo update-alternatives --install /usr/bin/cmake cmake /home/linuxbrew/.linuxbrew/bin/cmake 100
       - name: "Unlock Keyring"
         uses: t1m0thyj/unlock-keyring@v1
@@ -42,7 +42,7 @@ jobs:
         with:
           pkgs: boost-json curl gettext-libintl glib gtest libsecret maddy openssl
           triplet: x64-linux
-          revision: f26ec398c25c4980f33a50391f00a75f7ad62ef7
+          revision: 89dc8be6dbcf18482a5a1bf86a2f4615c939b0fb
           token: ${{ github.token }}
           github-binarycache: true
       - name: "Build"

.github/workflows/macos.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           pkgs: boost-json curl gettext-libintl glib gtest maddy openssl
           triplet: arm64-osx
-          revision: f26ec398c25c4980f33a50391f00a75f7ad62ef7
+          revision: 89dc8be6dbcf18482a5a1bf86a2f4615c939b0fb
           token: ${{ github.token }}
           github-binarycache: true
       - name: "Build"

.github/workflows/windows.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           pkgs: boost-json curl gettext-libintl gtest maddy sqlcipher
           triplet: x64-windows
-          revision: f26ec398c25c4980f33a50391f00a75f7ad62ef7
+          revision: 89dc8be6dbcf18482a5a1bf86a2f4615c939b0fb
           token: ${{ github.token }}
           github-binarycache: true
       - name: "Build"

CHANGELOG.md

@@ -1,11 +1,20 @@
 # Changelog
 
+## 2025.6.1
+### Breaking Changes
+None
+### New APIs
+#### App
+- Expanded `X` and `Y` properties of `WindowGeometry` to all platforms
+### Fixes
+None
+
 ## 2025.6.0
 ### Breaking Changes
 None
 ### New APIs
 #### App
-- Added the ability for `WindowGeometry` to remeber window poisition on Windows
+- Added the ability for `WindowGeometry` to remember window position on Windows
 ### Fixes
 None
 

CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 #libnick Definition
-project ("libnick" LANGUAGES C CXX VERSION 2025.6.0 DESCRIPTION "A cross-platform base for native Nickvision applications.")
+project ("libnick" LANGUAGES C CXX VERSION 2025.6.1 DESCRIPTION "A cross-platform base for native Nickvision applications.")
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 include(CTest)

Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "libnick"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "2025.6.0"
+PROJECT_NUMBER         = "2025.6.1"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/app/windowgeometry.h

@@ -24,9 +24,6 @@
 #define WINDOWGEOMETRY_H
 
 #include <boost/json.hpp>
-#ifdef _WIN32
-#include <windows.h>
-#endif
 
 namespace Nickvision::App
 {
@@ -47,7 +44,6 @@ namespace Nickvision::App
          * @param isMaximized Whether or not the window is maximized
          */
         WindowGeometry(long width, long height, bool isMaximized);
-#ifdef _WIN32
         /**
          * @brief Construct a WindowGeometry.
          * @param width The width of the window
@@ -58,11 +54,9 @@ namespace Nickvision::App
          */
         WindowGeometry(long width, long height, bool isMaximized, long x, long y);
         /**
-         * @brief Construct a WindowGeometry.
-         * @param hwnd The window handle to get the geometry from
+         * @brief Constructs a WindowGeometry.
+         * @param json The json object
          */
-        WindowGeometry(HWND hwnd);
-#endif
         WindowGeometry(boost::json::object json);
         /**
          * @brief Gets the width of the window.
@@ -94,24 +88,38 @@ namespace Nickvision::App
          * @param isMaximized True if maximized, else false
          */
         void setIsMaximized(bool isMaximized);
-#ifdef _WIN32
         /**
-         * @brief Applies the geometry to a window.
-         * @param hwnd The window handle to apply the geometry to
-         * @return True if successful, else false
+         * @brief Gets the x position of the window.
+         * @return The x position of the window
+         */
+        long getX() const;
+        /**
+         * @brief Sets the x position of the window.
+         * @param x The new x position of the window
+         */
+        void setX(long x);
+        /**
+         * @brief Gets the y position of the window.
+         * @return The y position of the window
+         */
+        long getY() const;
+        /**
+         * @brief Sets the y position of the window.
+         * @param x The new y position of the window
+         */
+        void setY(long y);
+        /**
+         * @brief Converts the WindowGeometry to a json object.
+         * @return The json representation of the WindowGeometry
          */
-        bool apply(HWND hwnd) const;
-#endif
         boost::json::object toJson() const;
 
     private:
         long m_width;
         long m_height;
         bool m_isMaximized;
-#ifdef _WIN32
         long m_x;
         long m_y;
-#endif
     };
 }
 

manual/README.md

@@ -6,12 +6,12 @@
 
 libnick provides Nickvision apps with a common set of cross-platform APIs for managing system and desktop app functionality such as network management, taskbar icons, translations, app updates, and more.
 
-## 2025.6.0
+## 2025.6.1
 ### Breaking Changes
 None
 ### New APIs
 #### App
-- Added the ability for `WindowGeometry` to remeber window poisition on Windows
+- Expanded `X` and `Y` properties of `WindowGeometry` to all platforms
 ### Fixes
 None
 

src/app/windowgeometry.cpp

@@ -5,26 +5,23 @@ namespace Nickvision::App
     WindowGeometry::WindowGeometry()
         : m_width{ 800 },
         m_height{ 600 },
-        m_isMaximized{ false }
+        m_isMaximized{ false },
+        m_x{ 10 },
+        m_y{ 10 }
     {
-#ifdef _WIN32
-        m_x = 10;
-        m_y = 10;
-#endif
+
     }
 
     WindowGeometry::WindowGeometry(long width, long height, bool isMaximized)
         : m_width{ width },
         m_height{ height },
-        m_isMaximized{ isMaximized }
+        m_isMaximized{ isMaximized },
+        m_x{ 10 },
+        m_y{ 10 }
     {
-#ifdef _WIN32
-        m_x = 10;
-        m_y = 10;
-#endif
+
     }
 
-#ifdef _WIN32
     WindowGeometry::WindowGeometry(long width, long height, bool isMaximized, long x, long y)
         : m_width{ width },
         m_height{ height },
@@ -35,27 +32,14 @@ namespace Nickvision::App
 
     }
 
-    WindowGeometry::WindowGeometry(HWND hwnd)
-    {
-        WINDOWPLACEMENT placement;
-        GetWindowPlacement(hwnd, &placement);
-        m_width = placement.rcNormalPosition.right - placement.rcNormalPosition.left;
-        m_height = placement.rcNormalPosition.bottom - placement.rcNormalPosition.top;
-        m_isMaximized = placement.showCmd == SW_SHOWMAXIMIZED;
-        m_x = placement.rcNormalPosition.left;
-        m_y = placement.rcNormalPosition.top;
-    }
-#endif
-
     WindowGeometry::WindowGeometry(boost::json::object json)
-        : m_width{ json["Width"].is_int64() ? static_cast<long>(json["Width"].as_int64()) : 0 },
-        m_height{ json["Height"].is_int64() ? static_cast<long>(json["Height"].as_int64()) : 0 },
-        m_isMaximized{ json["IsMaximized"].is_bool() ? json["IsMaximized"].as_bool() : false }
+        : m_width{ json["Width"].is_int64() ? static_cast<long>(json["Width"].as_int64()) : 800 },
+        m_height{ json["Height"].is_int64() ? static_cast<long>(json["Height"].as_int64()) : 600 },
+        m_isMaximized{ json["IsMaximized"].is_bool() ? json["IsMaximized"].as_bool() : false },
+        m_x{ json["X"].is_int64() ? static_cast<long>(json["X"].as_int64()) : 10 },
+        m_y{ json["Y"].is_int64() ? static_cast<long>(json["Y"].as_int64()) : 10 }
     {
-#ifdef _WIN32
-        m_x = json["X"].is_int64() ? static_cast<long>(json["X"].as_int64()) : 0;
-        m_y = json["Y"].is_int64() ? static_cast<long>(json["Y"].as_int64()) : 0;
-#endif
+
     }
 
     long WindowGeometry::getWidth() const
@@ -88,30 +72,34 @@ namespace Nickvision::App
         m_isMaximized = isMaximized;
     }
 
-#ifdef _WIN32
-    bool WindowGeometry::apply(HWND hwnd) const
+    long WindowGeometry::getX() const
+    {
+        return m_x;
+    }
+
+    void WindowGeometry::setX(long x)
+    {
+        m_x = x;
+    }
+
+    long WindowGeometry::getY() const
+    {
+        return m_y;
+    }
+
+    void WindowGeometry::setY(long y)
     {
-        WINDOWPLACEMENT placement;
-        GetWindowPlacement(hwnd, &placement);
-        placement.rcNormalPosition.left = m_x;
-        placement.rcNormalPosition.top = m_y;
-        placement.rcNormalPosition.right = placement.rcNormalPosition.left + m_width;
-        placement.rcNormalPosition.bottom = placement.rcNormalPosition.top + m_height;
-        placement.showCmd = m_isMaximized ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL;
-        return SetWindowPlacement(hwnd, &placement);
+        m_y = y;
     }
-#endif
 
     boost::json::object WindowGeometry::toJson() const
     {
         boost::json::object json;
         json["Width"] = m_width;
         json["Height"] = m_height;
         json["IsMaximized"] = m_isMaximized;
-#ifdef _WIN32
         json["X"] = m_x;
         json["Y"] = m_y;
-#endif
         return json;
     }
 }