improvement

2026-01-12 10:54:55 +08:00 · 2025-08-23 21:12:57 -04:00
parent 7c5f1a804e
commit 81c59495c0
21 changed files with 390 additions and 4 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -58,6 +58,7 @@
            <converter:ShortcutToStringConverter x:Key="ShortcutToStringConverter" />
            <converter:BoolNegationToVisibilityConverter x:Key="BoolNegationToVisibilityConverter" />
            <converter:BoolToOpacityConverter x:Key="BoolToOpacityConverter" />
+            <converter:RectToMarginConverter x:Key="RectToMarginConverter" />

            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
            <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
@@ -46,6 +46,15 @@
                        </ComboBox>
                    </controls:SettingsCard>

+                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                        <local:ExtendedSlider
+                            Default="18"
+                            Frequency="2"
+                            Maximum="48"
+                            Minimum="12"
+                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.SongInfoFontSize, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
                </StackPanel>
            </Grid>
        </ScrollViewer>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml
@@ -62,6 +62,124 @@
                                </ComboBox>
                            </controls:SettingsCard>

+                            <controls:SettingsExpander
+                                x:Name="LyricsWindowManagerExpander"
+                                x:Uid="SettingsPageLyricsWindowManager"
+                                HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                         Glyph=&#xE61F;}"
+                                IsExpanded="True" />
+
+                            <Grid
+                                Margin="0,-20,0,0"
+                                Padding="60,16"
+                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                CornerRadius="4"
+                                Visibility="{Binding ElementName=LyricsWindowManagerExpander, Path=IsExpanded, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <StackPanel Spacing="16">
+                                    <TextBlock x:Uid="SettingsPageCurrentLyricsWindowStatus" />
+                                    <StackPanel HorizontalAlignment="Left" Spacing="4">
+                                        <Grid
+                                            Width="{x:Bind ViewModel.LiveStates.DemoLyricsWindowMonitorBounds.Width, Mode=OneWay}"
+                                            Height="{x:Bind ViewModel.LiveStates.DemoLyricsWindowMonitorBounds.Height, Mode=OneWay}"
+                                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
+                                            <Grid
+                                                Width="{x:Bind ViewModel.LiveStates.DemoLyricsWindowBounds.Width, Mode=OneWay}"
+                                                Height="{x:Bind ViewModel.LiveStates.DemoLyricsWindowBounds.Height, Mode=OneWay}"
+                                                Margin="{x:Bind ViewModel.LiveStates.DemoLyricsWindowBounds, Converter={StaticResource RectToMarginConverter}, Mode=OneWay}"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Top"
+                                                Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                                CornerRadius="4" />
+                                            <TextBlock
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontWeight="ExtraBlack"
+                                                Opacity="0.7"
+                                                Text="{x:Bind ViewModel.LiveStates.LyricsWindowMonitorName, Mode=OneWay}"
+                                                TextWrapping="Wrap" />
+                                        </Grid>
+                                        <Grid>
+                                            <Button
+                                                x:Uid="SettingsPageRecord"
+                                                HorizontalAlignment="Stretch"
+                                                Command="{x:Bind ViewModel.RecordCurrentWindowBoundsCommand}"
+                                                Style="{StaticResource AccentButtonStyle}" />
+                                        </Grid>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+
+                            <StackPanel
+                                Margin="0,-3,0,0"
+                                Padding="60,16"
+                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                CornerRadius="4"
+                                Spacing="16"
+                                Visibility="{Binding ElementName=LyricsWindowManagerExpander, Path=IsExpanded, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <TextBlock x:Uid="SettingsPageRecordedWindowStatus" />
+                                <GridView
+                                    Margin="-2"
+                                    CornerRadius="4"
+                                    ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+                                    SelectionMode="None">
+                                    <GridView.ItemContainerStyle>
+                                        <Style BasedOn="{StaticResource DefaultGridViewItemStyle}" TargetType="GridViewItem">
+                                            <Setter Property="Margin" Value="5,5,5,5" />
+                                        </Style>
+                                    </GridView.ItemContainerStyle>
+                                    <GridView.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <ItemsWrapGrid Orientation="Horizontal" />
+                                        </ItemsPanelTemplate>
+                                    </GridView.ItemsPanel>
+                                    <GridView.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid>
+                                                <StackPanel Spacing="4">
+                                                    <Grid
+                                                        Width="{Binding DemoMonitorBounds.Width}"
+                                                        Height="{Binding DemoMonitorBounds.Height}"
+                                                        Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
+                                                        <Grid
+                                                            Width="{Binding DemoWindowBounds.Width}"
+                                                            Height="{Binding DemoWindowBounds.Height}"
+                                                            Margin="{Binding DemoWindowBounds, Converter={StaticResource RectToMarginConverter}}"
+                                                            HorizontalAlignment="Left"
+                                                            VerticalAlignment="Top"
+                                                            Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                                            CornerRadius="4" />
+                                                        <TextBlock
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            FontWeight="ExtraBlack"
+                                                            Opacity="0.7"
+                                                            Text="{Binding MonitorDeviceName}"
+                                                            TextWrapping="Wrap" />
+                                                    </Grid>
+                                                    <Grid ColumnSpacing="4">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="*" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Button
+                                                            x:Uid="SettingsPageDelete"
+                                                            Grid.Column="0"
+                                                            HorizontalAlignment="Stretch"
+                                                            Click="DeleteWindowBoundsRecordButton_Click" />
+                                                        <Button
+                                                            x:Uid="SettingsPageApply"
+                                                            Grid.Column="1"
+                                                            HorizontalAlignment="Stretch"
+                                                            Click="ApplyWindowBoundsRecordButton_Click"
+                                                            Style="{StaticResource AccentButtonStyle}" />
+                                                    </Grid>
+                                                </StackPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </GridView.ItemTemplate>
+                                </GridView>
+                            </StackPanel>
+
                            <controls:SettingsCard x:Uid="SettingsPageIgnoreFullscreenWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE967;}">
                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreFullscreenWindow, Mode=TwoWay}" />
                            </controls:SettingsCard>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
@@ -1,5 +1,8 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -46,5 +49,33 @@ namespace BetterLyrics.WinUI3.Controls
        {
            AutoStartupToggleSwitch.Toggled -= AutoStartupToggleSwitch_Toggled;
        }
+
+        private void DeleteWindowBoundsRecordButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button button)
+            {
+                var data = button.DataContext as WindowBoundsRecord;
+                if (data != null)
+                {
+                    ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
+                }
+            }
+        }
+
+        private void ApplyWindowBoundsRecordButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button button)
+            {
+                var data = button.DataContext as WindowBoundsRecord;
+                if (data != null)
+                {
+                    var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+                    if (lyricsWindow != null)
+                    {
+                        lyricsWindow.AppWindow.MoveAndResize(data.WindowBounds.ToRectInt32());
+                    }
+                }
+            }
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public class RectToMarginConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is Windows.Foundation.Rect rect)
+            {
+                return new Microsoft.UI.Xaml.Thickness(rect.X, rect.Y, 0, 0);
+            }
+            return new Microsoft.UI.Xaml.Thickness(0);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.UI.Xaml;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -6,6 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
+using WinRT.Interop;

 namespace BetterLyrics.WinUI3.Helper
 {
@@ -60,5 +62,14 @@ namespace BetterLyrics.WinUI3.Helper
            var primaryMonitorInfo = GetPrimaryMonitorInfoEx();
            return primaryMonitorInfo.szDevice;
        }
+
+        public static User32.MONITORINFOEX GetMonitorInfoExFromWindow(Window window)
+        {
+            var hwnd = WindowNative.GetWindowHandle(window);
+            var hMonitor = User32.MonitorFromWindow(hwnd, User32.MonitorFlags.MONITOR_DEFAULTTONEAREST);
+            User32.MONITORINFOEX monitorInfoEx = new() { cbSize = (uint)Marshal.SizeOf<User32.MONITORINFOEX>() };
+            User32.GetMonitorInfo(hMonitor, ref monitorInfoEx);
+            return monitorInfoEx;
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs
@@ -1,4 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
@@ -6,6 +7,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Vanara.PInvoke;
+using Windows.Foundation;

 namespace BetterLyrics.WinUI3.Models
 {
@@ -16,6 +19,11 @@ namespace BetterLyrics.WinUI3.Models
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; }
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings LyricsStyleSettings { get; set; }
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings LyricsEffectSettings { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect LyricsWindowBounds { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect LyricsWindowMonitorBounds { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect DemoLyricsWindowBounds { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect DemoLyricsWindowMonitorBounds { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWindowMonitorName { get; set; }

        public LiveStates(AppSettings appSettings)
        {
@@ -37,5 +45,32 @@ namespace BetterLyrics.WinUI3.Models
                LyricsWindowMode = mode;
            }
        }
+
+        partial void OnLyricsWindowBoundsChanged(Rect value)
+        {
+            double factor = 0.1;
+            DemoLyricsWindowBounds = new Rect(
+                value.X * factor,
+                value.Y * factor,
+                value.Width * factor,
+                value.Height * factor
+            );
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<Views.LyricsWindow>();
+            if (lyricsWindow == null) return;
+            var mointor = MonitorHelper.GetMonitorInfoExFromWindow(lyricsWindow);
+            LyricsWindowMonitorName = mointor.szDevice;
+            LyricsWindowMonitorBounds = new Rect(
+                mointor.rcWork.Left,
+                mointor.rcWork.Top,
+                mointor.rcWork.Width,
+                mointor.rcWork.Height
+            );
+            DemoLyricsWindowMonitorBounds = new Rect(
+                mointor.rcWork.Left * factor,
+                mointor.rcWork.Top * factor,
+                mointor.rcWork.Width * factor,
+                mointor.rcWork.Height * factor
+            );
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
@@ -13,6 +13,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType SongInfoAlignmentType { get; set; } = TextAlignmentType.Left;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageRadius { get; set; } = 12; // 12 % of the cover image size
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageShadowAmount { get; set; } = 12;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SongInfoFontSize { get; set; } = 18;

        public AlbumArtLayoutSettings() { }
    }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
@@ -34,8 +34,8 @@ namespace BetterLyrics.WinUI3.Models.Settings

        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; } = [];
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; } = [];
-
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MappedSongSearchQuery> MappedSongSearchQueries { get; set; } = [];
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<WindowBoundsRecord> WindowBoundsRecords { get; set; } = [];

        public AppSettings() { }
    }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/WindowBoundsRecord.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/WindowBoundsRecord.cs
@@ -0,0 +1,19 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class WindowBoundsRecord : ObservableObject
+    {
+        [ObservableProperty] public partial string MonitorDeviceName { get; set; } = string.Empty;
+        [ObservableProperty] public partial Rect WindowBounds { get; set; }
+        [ObservableProperty] public partial Rect DemoWindowBounds { get; set; }
+        [ObservableProperty] public partial Rect MonitorBounds { get; set; }
+        [ObservableProperty] public partial Rect DemoMonitorBounds { get; set; }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs
@@ -60,6 +60,9 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
            AppSettings.MappedSongSearchQueries.CollectionChanged += AppSettings_CollectionChanged;
            AppSettings.MappedSongSearchQueries.ItemPropertyChanged += AppSettings_ItemPropertyChanged;

+            AppSettings.WindowBoundsRecords.CollectionChanged += AppSettings_CollectionChanged;
+            AppSettings.WindowBoundsRecords.ItemPropertyChanged += AppSettings_ItemPropertyChanged;
+
            AppSettings.Version = MetadataHelper.AppVersion;

            EnsureMediaSourceProvidersInfo();
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -499,6 +499,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
    <value>App behavior</value>
  </data>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>Apply</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>Auto-lock when activating desktop mode</value>
  </data>
@@ -544,12 +547,18 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
    <value>Compact</value>
  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>Current lyrics window status</value>
+  </data>
  <data name="SettingsPageDark.Content" xml:space="preserve">
    <value>Dark</value>
  </data>
  <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
    <value>Show debug overlay</value>
  </data>
+  <data name="SettingsPageDelete.Content" xml:space="preserve">
+    <value>Delete</value>
+  </data>
  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
    <value>Desktop Acrylic</value>
  </data>
@@ -904,6 +913,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
    <value>Top and bottom edge opacity</value>
  </data>
+  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+    <value>Lyrics window manager</value>
+  </data>
  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
    <value>Media library</value>
  </data>
@@ -973,6 +985,12 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
    <value>QQ feedback &amp; chat group</value>
  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>Record</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>Recorded window status</value>
+  </data>
  <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
    <value>Original files and folders in this path will not be deleted when removing it from this app</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -499,6 +499,9 @@
  <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
    <value>アプリの動作</value>
  </data>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>適用する</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>デスクトップモードをアクティブにするときの自動ロック</value>
  </data>
@@ -544,12 +547,18 @@
  <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
    <value>コンパクト</value>
  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>現在の歌詞ウィンドウステータス</value>
+  </data>
  <data name="SettingsPageDark.Content" xml:space="preserve">
    <value>暗い</value>
  </data>
  <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
    <value>デバッグオーバーレイを表示します</value>
  </data>
+  <data name="SettingsPageDelete.Content" xml:space="preserve">
+    <value>消去</value>
+  </data>
  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
    <value>デスクトップアクリル</value>
  </data>
@@ -904,6 +913,9 @@
  <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
    <value>上端と下端の不透明度</value>
  </data>
+  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+    <value>歌詞ウィンドウマネージャー</value>
+  </data>
  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
    <value>メディアライブラリ</value>
  </data>
@@ -973,6 +985,12 @@
  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
    <value>QQフィードバック＆チャットグループ</value>
  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>記録</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>記録されたウィンドウステータス</value>
+  </data>
  <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
    <value>このパスの元のファイルとフォルダーは、このアプリから削除するときに削除されません</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -499,6 +499,9 @@
  <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
    <value>앱 동작</value>
  </data>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>적용하다</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>데스크탑 모드를 활성화 할 때 자동 잠금</value>
  </data>
@@ -544,12 +547,18 @@
  <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
    <value>콤팩트</value>
  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>현재 가사 창 상태</value>
+  </data>
  <data name="SettingsPageDark.Content" xml:space="preserve">
    <value>어두운</value>
  </data>
  <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
    <value>디버그 오버레이를 표시하십시오</value>
  </data>
+  <data name="SettingsPageDelete.Content" xml:space="preserve">
+    <value>삭제</value>
+  </data>
  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
    <value>데스크탑 아크릴</value>
  </data>
@@ -904,6 +913,9 @@
  <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
    <value>상단 및 하단 가장자리 불투명도</value>
  </data>
+  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+    <value>가사 창 관리자</value>
+  </data>
  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
    <value>미디어 라이브러리</value>
  </data>
@@ -973,6 +985,12 @@
  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
    <value>QQ 피드백 및 채팅 그룹</value>
  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>기록</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>기록 된 창 상태</value>
+  </data>
  <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
    <value>이 경로의 원본 파일과 폴더는이 앱에서 제거 할 때 삭제되지 않습니다.</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -499,6 +499,9 @@
  <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
    <value>应用行为</value>
  </data>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>应用</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>启动桌面模式时随即锁定窗口</value>
  </data>
@@ -544,12 +547,18 @@
  <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
    <value>紧凑</value>
  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>当前歌词窗口状态</value>
+  </data>
  <data name="SettingsPageDark.Content" xml:space="preserve">
    <value>深色</value>
  </data>
  <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
    <value>显示调试覆盖层</value>
  </data>
+  <data name="SettingsPageDelete.Content" xml:space="preserve">
+    <value>删除</value>
+  </data>
  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
    <value>亚克力（桌面）</value>
  </data>
@@ -904,6 +913,9 @@
  <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
    <value>上下边缘不透明度</value>
  </data>
+  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+    <value>歌词窗口管理</value>
+  </data>
  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
    <value>媒体库</value>
  </data>
@@ -973,6 +985,12 @@
  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
    <value>QQ 反馈交流群</value>
  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>记录</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>记录的窗口状态</value>
+  </data>
  <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
    <value>路径中的原始文件和文件夹不会被删除</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -499,6 +499,9 @@
  <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
    <value>應用行為</value>
  </data>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>應用</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>啟動桌面模式時隨即鎖定窗口</value>
  </data>
@@ -544,12 +547,18 @@
  <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
    <value>緊湊</value>
  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>當前歌詞窗口狀態</value>
+  </data>
  <data name="SettingsPageDark.Content" xml:space="preserve">
    <value>深色</value>
  </data>
  <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
    <value>顯示調試覆蓋層</value>
  </data>
+  <data name="SettingsPageDelete.Content" xml:space="preserve">
+    <value>刪除</value>
+  </data>
  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
    <value>亞克力（桌面）</value>
  </data>
@@ -904,6 +913,9 @@
  <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
    <value>上下邊緣不透明度</value>
  </data>
+  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+    <value>歌詞視窗管理</value>
+  </data>
  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
    <value>媒體庫</value>
  </data>
@@ -973,6 +985,12 @@
  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
    <value>QQ 回饋交流群</value>
  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>記錄</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>記錄的窗口狀態</value>
+  </data>
  <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
    <value>路徑中的原始檔案和資料夾不會被刪除</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs
@@ -1,5 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -13,19 +15,25 @@ namespace BetterLyrics.WinUI3.ViewModels
    public partial class AppSettingsControlViewModel : BaseViewModel
    {
        private readonly ISettingsService _settingsService;
+        private readonly ILiveStatesService _liveStatesService;

        [ObservableProperty]
        public partial AppSettings AppSettings { get; set; }

+        [ObservableProperty]
+        public partial LiveStates LiveStates { get; set; }
+
        [ObservableProperty]
        public partial ObservableCollection<string> MonitorDeviceNames { get; set; }


-        public AppSettingsControlViewModel(ISettingsService settingsService)
+        public AppSettingsControlViewModel(ISettingsService settingsService, ILiveStatesService liveStatesService)
        {
            _settingsService = settingsService;
+            _liveStatesService = liveStatesService;
            MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
            AppSettings = _settingsService.AppSettings;
+            LiveStates = _liveStatesService.LiveStates;
        }

        [RelayCommand]
@@ -41,6 +49,19 @@ namespace BetterLyrics.WinUI3.ViewModels
            AppSettings.DockModeSettings.DockMonitorDeviceName = MonitorHelper.GetPrimaryMonitorDeviceName();
        }

+        [RelayCommand]
+        private void RecordCurrentWindowBounds()
+        {
+            AppSettings.WindowBoundsRecords.Add(new WindowBoundsRecord
+            {
+                WindowBounds = LiveStates.LyricsWindowBounds,
+                MonitorDeviceName = LiveStates.LyricsWindowMonitorName,
+                MonitorBounds = LiveStates.LyricsWindowMonitorBounds,
+                DemoWindowBounds = LiveStates.DemoLyricsWindowBounds,
+                DemoMonitorBounds = LiveStates.DemoLyricsWindowMonitorBounds
+            });
+        }
+
        public async Task<bool> ToggleAutoStartupAsync(bool target)
        {
            StartupTask startupTask = await StartupTask.GetAsync(Constants.App.AutoStartupTaskId);
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
@@ -133,6 +133,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                {
                    _isAlbumArtShadowAmountChanged = true;
                }
+                else if (message.PropertyName == nameof(AlbumArtLayoutSettings.SongInfoFontSize))
+                {
+                    UpdateSongInfoFontSize();
+                }
            }
            else if (message.Sender is LyricsBackgroundSettings)
            {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
@@ -328,7 +328,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel

            if (_liveStatesService.LiveStates.LyricsStyleSettings.IsDynamicLyricsFontSize)
            {
-                _lyricsTextFormat.FontSize = (float)Math.Max(12, Math.Min(_canvasHeight, _canvasWidth) / 10);
+                _lyricsTextFormat.FontSize = (float)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 10, 12, 72);
            }
            else
            {
@@ -695,5 +695,11 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
            var current = _mediaSessionsService.GetCurrentMediaSourceProviderInfo();
            _isLastFMTrackEnabled = current?.IsLastFMTrackEnabled ?? false;
        }
+
+        private void UpdateSongInfoFontSize()
+        {
+            _titleTextFormat.FontSize = _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoFontSize;
+            _artistTextFormat.FontSize = _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoFontSize - 2;
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs
@@ -190,6 +190,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
            AppSettings = _settingsService.AppSettings;

            _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment = _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
+            UpdateSongInfoFontSize();
+

            _timelineSyncThreshold = 0;

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -2,6 +2,7 @@

 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
@@ -19,6 +20,7 @@ namespace BetterLyrics.WinUI3.Views
    public sealed partial class LyricsWindow : Window
    {
        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
        private readonly WindowMessageMonitor _wmm;
        private bool _autoSelectLyricsModeOnRunning = true;

@@ -101,6 +103,11 @@ namespace BetterLyrics.WinUI3.Views
                    break;
            }
            _autoSelectLyricsModeOnRunning = false;
+
+            var size = AppWindow.Size;
+            var rect = AppWindow.Position;
+
+            _liveStatesService.LiveStates.LyricsWindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
        }

        private void AppWindow_Changed(AppWindow sender, AppWindowChangedEventArgs args)
@@ -112,6 +119,8 @@ namespace BetterLyrics.WinUI3.Views
                var size = AppWindow.Size;
                var rect = AppWindow.Position;

+                _liveStatesService.LiveStates.LyricsWindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
+
                if (rect.X < 0 && rect.Y < 0 && rect.X + size.Width < 0 && rect.Y + size.Height < 0)
                {
                    return;