Merge 0bf3191262 into 1ca4484148

distribution/linux/Ryujinx.sh

@@ -20,4 +20,42 @@ if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"
 fi
 
+# Check if user already has a manual Avalonia scaling override or session type is x11.
+if [[ -n "${AVALONIA_GLOBAL_SCALE_FACTOR-}" || "$(echo "$XDG_SESSION_TYPE")" == "x11" ]]; then
+    echo "Scaling: Performed by environment, skipping." >&2
+else
+    # Query monitor config directly (GNOME), default display only.
+    if [[ "$(echo "$XDG_CURRENT_DESKTOP")" == "GNOME" && -f ~/.config/monitors.xml ]] then
+        echo -n 'Scaling: Monitor config located, querying scale...' >&2
+        SCALING="$(grep '<scale' ~/.config/monitors.xml -m 1 | cut -f2 -d">"|cut -f1 -d"<")"
+        SCALING="${SCALING##* }"
+        echo "found! Factor: ${SCALING}" >&2
+
+    # Fallback to X DPI query for others.
+    # Plasma handles this fine, GNOME will always round up e.g. 1.25 -> 2.00.
+    elif command -v xrdb >/dev/null; then
+        echo -n 'Scaling: Attempting to get scaling from X DPI value...' >&2
+        dpi="$(xrdb -get Xft.dpi)"
+        if [[ -n "${dpi}" ]]; then
+            SCALING=$(echo "scale=2; ${dpi}/96" | bc)
+        fi
+        echo "found! Factor: ${SCALING}"
+
+    # Query kscreen-doctor for Plasma as a fallback.
+    elif [[ "$(echo "$XDG_CURRENT_DESKTOP")" == "KDE" ]] && command -v kscreen-doctor >/dev/null; then
+        echo -n 'Scaling: Attempting to get Plasma desktop scaling factor...' >&2
+        SCALING="$(kscreen-doctor --outputs | grep "Scale" -m 1)"
+        SCALING="${SCALING##* }"
+        SCALING=$(echo $SCALING | sed 's/\x1B\[[0-9;]*m//g') # Trim ANSI chars from ksd output.
+        echo "found! Factor: ${SCALING}"
+    fi
+
+    if [[ -z "${SCALING-}" || "${SCALING-}" == "0" ]]; then
+        echo 'Unset invalid scaling value' >&2
+        SCALING="1"
+    fi
+
+    COMMAND="$COMMAND AVALONIA_GLOBAL_SCALE_FACTOR=$SCALING"
+fi
+
 exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -4,10 +4,10 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:pt="using:Projektanker.Icons.Avalonia"
     HorizontalAlignment="Stretch"
     VerticalAlignment="Stretch"
     d:DesignHeight="800"
@@ -507,65 +507,49 @@
                         CornerRadius="5"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Stretch">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <StackPanel Orientation="Vertical" Spacing="5">
                                 <CheckBox
-                                Margin="10"
+                                    Margin="10, 10, 10, 0"
                                     MinWidth="0"
-                                Grid.Column="0"
                                     IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
                                     <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
                                 </CheckBox>
                                 <Button
-                                Margin="10"
-                                Grid.Column="1"
+                                    Margin="10, 0, 10, 10"
                                     Command="{Binding ShowMotionConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <pt:Icon Value="fa-solid fa-gear" />
                                 </Button>
-                        </Grid>
-                    </Border>
-                    <Border
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="5"
-                        HorizontalAlignment="Stretch"
-                        Margin="0,-1,0,0">
-                        <Grid ColumnDefinitions="*,Auto">
+                            </StackPanel>
+                            <controls:MiniVerticalSeparator Height="64"/>
+                            <StackPanel Orientation="Vertical" Spacing="5">
                                 <CheckBox
-                                Margin="10"
+                                    Margin="10, 10, 10, 0"
                                     MinWidth="0"
-                                Grid.Column="0"
                                     IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
                                     <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
                                 </CheckBox>
                                 <Button
-                                Margin="10"
-                                Grid.Column="1"
+                                    Margin="10, 0, 10, 10"
                                     Command="{Binding ShowRumbleConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <pt:Icon Value="fa-solid fa-gear" />
                                 </Button>
-                        </Grid>
-                    </Border>
-                    <Border
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="5"
-                        HorizontalAlignment="Stretch"
-                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
+                            </StackPanel>
+                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
+                            <StackPanel Orientation="Vertical" Spacing="5">
                                 <CheckBox
-                                Margin="10, 10, 5, 10"
+                                    Margin="10, 10, 10, 0"
                                     MinWidth="0"
-                                Grid.Column="0"
                                     IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
                                     <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
                                 </CheckBox>
                                 <Button
-                                Margin="10"
-                                Grid.Column="1"
+                                    Margin="10, 0, 10, 10"
                                     Command="{Binding ShowLedConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <pt:Icon Value="fa-solid fa-gear" />
                                 </Button>
-                        </Grid>
+                            </StackPanel>
+                        </StackPanel>
                     </Border>
                 </StackPanel>
             </StackPanel>

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -19,7 +18,9 @@
         HorizontalScrollBarVisibility="Disabled"
         VerticalScrollBarVisibility="Auto">
         <Border Classes="settings">
+            <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
                 <StackPanel
+                    Grid.Column="0"
                     Margin="10"
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical"
@@ -80,7 +81,8 @@
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
@@ -102,7 +104,8 @@
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
                                 </ComboBoxItem>
                                 <ComboBoxItem>
                                     <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
@@ -155,7 +158,20 @@
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
                     </StackPanel>
-                <Separator Height="1" />
+                </StackPanel>
+                <Border Grid.Column="1"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Margin="10, 10, 10, 0"
+                        Height="405"
+                        BorderBrush="Gray"
+                        Background="Gray"
+                        Width="1" />
+                <StackPanel
+                    Margin="10"
+                    Spacing="10"
+                    Grid.Column="2"
+                    Orientation="Vertical" HorizontalAlignment="Stretch">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
                         <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
@@ -211,7 +227,8 @@
                             <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
+                        <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
+                                   Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                     </StackPanel>
                     <StackPanel
                         IsEnabled="{Binding !IsGameTitleNotNull}"
@@ -259,6 +276,7 @@
                         </Grid>
                     </StackPanel>
                 </StackPanel>
+            </Grid>
         </Border>
     </ScrollViewer>
 </UserControl>

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml

@@ -40,7 +40,7 @@
                         <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
                             <Grid MinWidth="800"
                                   Margin="10"
-                                  ColumnDefinitions="*,Auto,Auto,*"
+                                  ColumnDefinitions="Auto,Auto,Auto,*"
                                   Background="Transparent"
                                   ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                 <TextBlock Grid.Column="0"

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml

@@ -13,7 +13,7 @@
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
     Height="910"
-    MinWidth="800"
+    MinWidth="1037"
     MinHeight="480"
     WindowStartupLocation="CenterOwner"
     x:DataType="viewModels:SettingsViewModel"

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -13,7 +13,7 @@
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     Width="1100"
-    MinWidth="800"
+    MinWidth="844"
     MinHeight="480"
     Title="{ext:WindowTitle Settings}"
     WindowStartupLocation="CenterOwner"

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -31,8 +31,8 @@ namespace Ryujinx.Ava.UI.Windows
                     : NavigationViewPaneDisplayMode.Top;
 
             Height = ConfigurationState.Instance.ShowOldUI
-                ? 927
-                : 993; // nav panel is put on top with custom title bar so account for new height
+                ? 906
+                : 954; // nav panel is put on top with custom title bar so account for new height
             
             Load();
         }