From 3beaff35bbe310673eb5ca33581f73588aa1a39f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 31 Jan 2024 09:17:22 -0800 Subject: [PATCH] feat: Use automatic desktop sizing from nested desktop for Waydroid --- system_files/desktop/shared/usr/bin/waydroid-launcher | 3 ++- .../shared/usr/etc/default/steamos-nested-desktop | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename system_files/{deck => desktop}/shared/usr/etc/default/steamos-nested-desktop (100%) diff --git a/system_files/desktop/shared/usr/bin/waydroid-launcher b/system_files/desktop/shared/usr/bin/waydroid-launcher index 0b30cdab84..6ceed39c87 100755 --- 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/system_files/deck/shared/usr/etc/default/steamos-nested-desktop b/system_files/desktop/shared/usr/etc/default/steamos-nested-desktop similarity index 100% rename from system_files/deck/shared/usr/etc/default/steamos-nested-desktop rename to system_files/desktop/shared/usr/etc/default/steamos-nested-desktop