Merge 0bf3191262 into c76f32a4ee

distribution/linux/Ryujinx.sh

@@ -20,4 +20,42 @@ if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"
 fi
 
-exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"
+# 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/Common/LocaleManager.cs

@@ -26,7 +26,21 @@ namespace Ryujinx.Ava.Common.Locale
         public LocaleManager()
         {
             _localeStrings = new Dictionary<LocaleKeys, string>();
-            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>();
+            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>(new Dictionary<LocaleKeys, object[]>
+            {
+                { LocaleKeys.DialogConfirmationTitle, [RyujinxApp.FullAppName] },
+                { LocaleKeys.DialogUpdaterTitle, [RyujinxApp.FullAppName] },
+                { LocaleKeys.DialogErrorTitle, [RyujinxApp.FullAppName] },
+                { LocaleKeys.DialogWarningTitle, [RyujinxApp.FullAppName] },
+                { LocaleKeys.DialogExitTitle, [RyujinxApp.FullAppName] },
+                { LocaleKeys.DialogStopEmulationTitle, [RyujinxApp.FullAppName] },
+                { LocaleKeys.RyujinxInfo, [RyujinxApp.FullAppName] },
+                { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
+                { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
+                { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
+                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityCsv.Entries.Length] },
+                { LocaleKeys.CompatibilityListTitle, [CompatibilityCsv.Entries.Length] }
+            });
 
             Load();
         }
@@ -45,19 +59,6 @@ namespace Ryujinx.Ava.Common.Locale
 
                 ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
             }
-            
-            SetDynamicValues(LocaleKeys.DialogConfirmationTitle, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.DialogUpdaterTitle, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.DialogErrorTitle, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.DialogWarningTitle, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.DialogExitTitle, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.DialogStopEmulationTitle, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.RyujinxInfo, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.RyujinxConfirm, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.RyujinxUpdater, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.RyujinxRebooter, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, CompatibilityCsv.Entries.Length);
-            SetDynamicValues(LocaleKeys.CompatibilityListTitle, CompatibilityCsv.Entries.Length);
         }
 
         public string this[LocaleKeys key]

src/Ryujinx/UI/Windows/CheatWindow.axaml

@@ -20,38 +20,81 @@
         </Style>
     </Window.Styles>
     <Grid Name="CheatGrid" Margin="15" RowDefinitions="Auto,Auto,Auto,*,Auto" ColumnDefinitions="*,*">
-        <TextBlock
-            Grid.Row="1"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            MaxWidth="500"
-            Margin="20,15,20,5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            LineHeight="18"
-            Text="{Binding Heading}"
-            TextAlignment="Center"
-            TextWrapping="Wrap" />
-        <TextBlock
-            Grid.Row="2"
-            Grid.Column="0"
-            MaxWidth="500"
-            Margin="140,15,20,5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            LineHeight="30"
-            Text="{ext:Locale BuildId}"
-            TextAlignment="Center"
-            TextWrapping="Wrap" />
-        <TextBox
-            Grid.Row="2"
-            Grid.Column="1"
-            Margin="0,5,110,5"
-            MinWidth="160"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Text="{Binding BuildId}"
-            IsReadOnly="True" />
+        <Grid Name="FlushHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto,*">
+            <Image 
+                Grid.Row="0"
+                Grid.Column="0"
+                Name="RyuLogo"
+                HorizontalAlignment="Left"
+                Margin="-7, -22, 7, 0"
+                Height="28"
+                Width="28" />
+            <StackPanel Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"
+                        Margin="7, -7, 0, 5"
+                        Orientation="Horizontal"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Stretch">
+                <TextBlock
+                    MaxWidth="500"
+                    Margin="0,8,5,0"
+                    LineHeight="30"
+                    Text="{ext:Locale BuildId}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+                <TextBox
+                    Margin="0,0,0,0"
+                    MinWidth="135"
+                    Text="{Binding BuildId}"
+                    IsReadOnly="True" />
+            </StackPanel>
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                MaxWidth="500"
+                Margin="0,10,0,5"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                LineHeight="18"
+                Text="{Binding Heading}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+
+        </Grid>
+        <Grid Name="NormalHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,*">
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                MaxWidth="500"
+                Margin="20,15,20,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                LineHeight="18"
+                Text="{Binding Heading}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                MaxWidth="500"
+                Margin="140,15,20,5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                LineHeight="30"
+                Text="{ext:Locale BuildId}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+            <TextBox
+                Grid.Row="2"
+                Grid.Column="1"
+                Margin="0,5,110,5"
+                MinWidth="160"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="{Binding BuildId}"
+                IsReadOnly="True" />
+        </Grid>
         <Border
             Grid.Row="3"
             Grid.Column="0"

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

@@ -4,6 +4,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;
@@ -32,7 +33,7 @@ namespace Ryujinx.Ava.UI.Windows
             Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
         {
             MinWidth = 500;
             MinHeight = 650;
@@ -44,6 +45,10 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
+            FlushHeader.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            NormalHeader.IsVisible = ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+
             string modsBasePath = ModLoader.GetModsBasePath();
             string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, titleId);
             ulong titleIdValue = ulong.Parse(titleId, NumberStyles.HexNumber);

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

@@ -21,12 +21,10 @@ namespace Ryujinx.Ava.UI.Windows
                 SearchBoxNormal = { Text = titleId ?? string.Empty }
             });
 
-        public CompatibilityListWindow() : base(useCustomTitleBar: true)
+        public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
         {
             Title = RyujinxApp.FormatTitle(LocaleKeys.CompatibilityListTitle);
             
-            TitleBar.Height = 37;
-            
             InitializeComponent();
 
             RyuLogo.Source = MainWindowViewModel.IconBitmap;

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Windows
             await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
         }
         
-        protected StyleableAppWindow(bool useCustomTitleBar = false)
+        protected StyleableAppWindow(bool useCustomTitleBar = false, double? titleBarHeight = null)
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner;
             TransparencyLevelHint = [WindowTransparencyLevel.None];
@@ -34,6 +34,9 @@ namespace Ryujinx.Ava.UI.Windows
             {
                 TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
                 TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowTitleBar ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
+                
+                if (TitleBar.ExtendsContentIntoTitleBar && titleBarHeight != null)
+                    TitleBar.Height = titleBarHeight.Value;
             }
 
             Icon = MainWindowViewModel.IconBitmap;