Merge pull request #54 from levnikmyskin/move-to-aquamarine

fix: work on aquamarine backend
levnikmyskin · Jul 22, 2024 · ee9eb63 · ee9eb63
2 parents 751d7c6 + a296f7a
commit ee9eb63
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.github/actions/setup_base/action.yml b/.github/actions/setup_base/action.yml
@@ -49,6 +49,7 @@ runs:
           libxfont2 \
           libxkbcommon \
           libxkbfile \
+          libxcursor \
           lld \
           meson \
           ninja \
@@ -89,6 +90,15 @@ runs:
         cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
         cmake --install build
 
+    - name: Get aquamarine
+      shell: bash
+      run: |
+        git clone https://github.com/hyprwm/aquamarine.git
+        cd aquamarine
+        cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+        cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
+        cmake --install build
+
     - name: Get Xorg pacman pkgs
       shell: bash
       if: inputs.INSTALL_XORG_PKGS == 'true'

diff --git a/src/VirtualDesk.cpp b/src/VirtualDesk.cpp
@@ -184,5 +184,5 @@ Layout VirtualDesk::generateCurrentMonitorLayout() {
 std::string VirtualDesk::monitorDesc(const CMonitor* monitor) {
     if (!monitor->output)
         return monitor->szName;
-    return monitor->output->description ? monitor->output->description : monitor->szName;
+    return monitor->szDescription.empty() ? monitor->szName : monitor->szDescription;
 }