feat: Use automatic desktop sizing from nested desktop for Waydroid

ublue-os · Jan 31, 2024 · 3beaff3 · 3beaff3
1 parent 2867aef
commit 3beaff3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/system_files/desktop/shared/usr/bin/waydroid-launcher b/system_files/desktop/shared/usr/bin/waydroid-launcher
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 
 source /etc/default/waydroid-launcher
+source /etc/default/steamos-nested-desktop
 
 # Kill any previous remnants
 if [ "$(systemctl is-active waydroid-container.service)" == 'active' ]; then
@@ -16,7 +17,7 @@ fi
 killall -9 weston
 pkexec /usr/libexec/waydroid-container-start
 if [ -z "$(pgrep weston)" ]; then
-	/usr/bin/weston --socket=weston-waydroid --width=${WAYDROID_WIDTH:-1280} --height=${WAYDROID_HEIGHT:-800} &> /dev/null &
+	/usr/bin/weston --socket=weston-waydroid --width=${STEAMOS_NESTED_DESKTOP_WIDTH:-1280} --height=${STEAMOS_NESTED_DESKTOP_HEIGHT:-800} &> /dev/null &
 fi
 
 # Launch Waydroid

diff --git a/...ed/usr/etc/default/steamos-nested-desktop → ...ed/usr/etc/default/steamos-nested-desktop b/...ed/usr/etc/default/steamos-nested-desktop → ...ed/usr/etc/default/steamos-nested-desktop