add display type settings for every mode

2026-01-12 10:54:55 +08:00 · 2025-08-16 11:36:52 -04:00
parent cbaa81b9bb
commit 133acf5592
12 changed files with 139 additions and 64 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -58,6 +58,7 @@
 		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
+		<PackageReference Include="DevWinUI.Controls" Version="8.9.1" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
 		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml
@@ -74,10 +74,30 @@
                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
                    </controls:SettingsCard>

+                    <!--  Standard mode  -->
+
+                    <TextBlock x:Uid="SettingsPageAppStandard" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
+                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.StandardModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
+                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
+                            <ComboBoxItem x:Uid="MainPageSplitView" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
                    <!--  Desktop mode  -->

                    <TextBlock x:Uid="SettingsPageAppDesktop" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />

+                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
+                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DesktopModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
+                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
+                            <ComboBoxItem x:Uid="MainPageSplitView" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
                    <controls:SettingsCard x:Uid="SettingsPageAutoLock" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE755;}">
                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.DesktopModeSettings.AutoLockOnDesktopMode, Mode=TwoWay}" />
                    </controls:SettingsCard>
@@ -123,6 +143,14 @@

                    <TextBlock x:Uid="SettingsPageAppDock" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />

+                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
+                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DockModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
+                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
+                            <ComboBoxItem x:Uid="MainPageSplitView" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
                    <controls:SettingsCard x:Uid="SettingsPageDockMonitor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7F4;}">
                        <StackPanel Orientation="Horizontal" Spacing="6">
                            <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.AppSettings.DockModeSettings.DockMonitorDeviceName, Mode=TwoWay}" />
@@ -152,6 +180,18 @@
                        </ComboBox>
                    </controls:SettingsCard>

+                    <!--  Picture in picture mode  -->
+
+                    <TextBlock x:Uid="SettingsPageAppPictureInPicture" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
+                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.PictureInPictureModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
+                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
+                            <ComboBoxItem x:Uid="MainPageSplitView" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
                </StackPanel>
            </Grid>
        </ScrollViewer>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
@@ -14,7 +14,8 @@ using System.Threading.Tasks;
 namespace BetterLyrics.WinUI3.Services.LiveStatesService
 {
    public class LiveStatesService : BaseViewModel, ILiveStatesService,
-        IRecipient<PropertyChangedMessage<LyricsWindowMode>>
+        IRecipient<PropertyChangedMessage<LyricsWindowMode>>,
+        IRecipient<PropertyChangedMessage<LyricsDisplayType>>
    {
        private readonly ISettingsService _settingsService;

@@ -61,5 +62,49 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                }
            }
        }
+
+        public void Receive(PropertyChangedMessage<LyricsDisplayType> message)
+        {
+            if (message.Sender is StandardModeSettings)
+            {
+                if (message.PropertyName == nameof(StandardModeSettings.LyricsDisplayType))
+                {
+                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.StandardMode)
+                    {
+                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
+                    }
+                }
+            }
+            else if (message.Sender is DockModeSettings)
+            {
+                if (message.PropertyName == nameof(DockModeSettings.LyricsDisplayType))
+                {
+                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.DockMode)
+                    {
+                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
+                    }
+                }
+            }
+            else if (message.Sender is DesktopModeSettings)
+            {
+                if (message.PropertyName == nameof(DesktopModeSettings.LyricsDisplayType))
+                {
+                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.DesktopMode)
+                    {
+                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
+                    }
+                }
+            }
+            else if (message.Sender is PictureInPictureModeSettings)
+            {
+                if (message.PropertyName == nameof(PictureInPictureModeSettings.LyricsDisplayType))
+                {
+                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.PictureInPictureMode)
+                    {
+                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
+                    }
+                }
+            }
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -219,9 +219,6 @@
  <data name="LyricsNotFound" xml:space="preserve">
    <value>Lyrics not found</value>
  </data>
-  <data name="LyricsPageDisplayTypeButtonToolTip.Content" xml:space="preserve">
-    <value>Display type</value>
-  </data>
  <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
    <value>Lyrics provider</value>
  </data>
@@ -276,9 +273,6 @@
  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
    <value>Switch to desktop lyrics mode</value>
  </data>
-  <data name="MainPageDisplayTypeSwitcher.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Change display type</value>
-  </data>
  <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
    <value>Hover back again to show the toggle button</value>
  </data>
@@ -463,6 +457,12 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageAppDock.Text" xml:space="preserve">
    <value>Dock mode</value>
  </data>
+  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
+    <value>Picture-in-picture mode</value>
+  </data>
+  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
+    <value>Standard</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>Auto-lock when activating desktop mode</value>
  </data>
@@ -514,6 +514,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageDiscord.Header" xml:space="preserve">
    <value>Discord</value>
  </data>
+  <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
+    <value>Lyrics album layout mode</value>
+  </data>
  <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
    <value>Target monitor</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -219,9 +219,6 @@
  <data name="LyricsNotFound" xml:space="preserve">
    <value>歌詞が見つかりません</value>
  </data>
-  <data name="LyricsPageDisplayTypeButtonToolTip.Content" xml:space="preserve">
-    <value>表示タイプ</value>
-  </data>
  <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
    <value>歌詞プロバイダー</value>
  </data>
@@ -276,9 +273,6 @@
  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
    <value>デスクトップ歌詞モードに切り替えます</value>
  </data>
-  <data name="MainPageDisplayTypeSwitcher.ToolTipService.ToolTip" xml:space="preserve">
-    <value>表示タイプを変更します</value>
-  </data>
  <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
    <value>再びホバリングして、トグルボタンを表示します</value>
  </data>
@@ -463,6 +457,12 @@
  <data name="SettingsPageAppDock.Text" xml:space="preserve">
    <value>ドックモード</value>
  </data>
+  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
+    <value>ピクチャーインピクチャーモード</value>
+  </data>
+  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
+    <value>標準モード</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>デスクトップモードをアクティブにするときの自動ロック</value>
  </data>
@@ -514,6 +514,9 @@
  <data name="SettingsPageDiscord.Header" xml:space="preserve">
    <value>Discord</value>
  </data>
+  <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
+    <value>歌詞アルバムレイアウトモード</value>
+  </data>
  <data name="SettingsPageDockMonitor.Header" 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
@@ -219,9 +219,6 @@
  <data name="LyricsNotFound" xml:space="preserve">
    <value>가사를 찾을 수 없습니다</value>
  </data>
-  <data name="LyricsPageDisplayTypeButtonToolTip.Content" xml:space="preserve">
-    <value>디스플레이 유형</value>
-  </data>
  <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
    <value>가사 제공자</value>
  </data>
@@ -276,9 +273,6 @@
  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
    <value>데스크탑 가사 모드로 전환하십시오</value>
  </data>
-  <data name="MainPageDisplayTypeSwitcher.ToolTipService.ToolTip" xml:space="preserve">
-    <value>디스플레이 유형을 변경하십시오</value>
-  </data>
  <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
    <value>토글 버튼을 표시하려면 다시 다시 가져옵니다</value>
  </data>
@@ -463,6 +457,12 @@
  <data name="SettingsPageAppDock.Text" xml:space="preserve">
    <value>도크 모드</value>
  </data>
+  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
+    <value>사진 인당 모드</value>
+  </data>
+  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
+    <value>표준 모드</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>데스크탑 모드를 활성화 할 때 자동 잠금</value>
  </data>
@@ -514,6 +514,9 @@
  <data name="SettingsPageDiscord.Header" xml:space="preserve">
    <value>Discord</value>
  </data>
+  <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
+    <value>가사 앨범 레이아웃 모드</value>
+  </data>
  <data name="SettingsPageDockMonitor.Header" 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
@@ -219,9 +219,6 @@
  <data name="LyricsNotFound" xml:space="preserve">
    <value>未找到歌词</value>
  </data>
-  <data name="LyricsPageDisplayTypeButtonToolTip.Content" xml:space="preserve">
-    <value>显示类型</value>
-  </data>
  <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
    <value>歌词来源</value>
  </data>
@@ -276,9 +273,6 @@
  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
    <value>切换到桌面歌词模式</value>
  </data>
-  <data name="MainPageDisplayTypeSwitcher.ToolTipService.ToolTip" xml:space="preserve">
-    <value>切换显示模式</value>
-  </data>
  <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
    <value>再次悬停以显示切换按钮</value>
  </data>
@@ -463,6 +457,12 @@
  <data name="SettingsPageAppDock.Text" xml:space="preserve">
    <value>停靠模式</value>
  </data>
+  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
+    <value>画中画模式</value>
+  </data>
+  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
+    <value>标准模式</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>启动桌面模式时随即锁定窗口</value>
  </data>
@@ -514,6 +514,9 @@
  <data name="SettingsPageDiscord.Header" xml:space="preserve">
    <value>Discord</value>
  </data>
+  <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
+    <value>歌词专辑布局模式</value>
+  </data>
  <data name="SettingsPageDockMonitor.Header" 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
@@ -219,9 +219,6 @@
  <data name="LyricsNotFound" xml:space="preserve">
    <value>找不到歌詞</value>
  </data>
-  <data name="LyricsPageDisplayTypeButtonToolTip.Content" xml:space="preserve">
-    <value>顯示類型</value>
-  </data>
  <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
    <value>歌詞來源</value>
  </data>
@@ -276,9 +273,6 @@
  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
    <value>切換到桌面歌詞模式</value>
  </data>
-  <data name="MainPageDisplayTypeSwitcher.ToolTipService.ToolTip" xml:space="preserve">
-    <value>切換顯示模式</value>
-  </data>
  <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
    <value>再次懸停以顯示切換按鈕</value>
  </data>
@@ -463,6 +457,12 @@
  <data name="SettingsPageAppDock.Text" xml:space="preserve">
    <value>停靠模式</value>
  </data>
+  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
+    <value>畫中畫模式</value>
+  </data>
+  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
+    <value>標準模式</value>
+  </data>
  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
    <value>啟動桌面模式時隨即鎖定窗口</value>
  </data>
@@ -514,6 +514,9 @@
  <data name="SettingsPageDiscord.Header" xml:space="preserve">
    <value>Discord</value>
  </data>
+  <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
+    <value>歌詞專輯佈局模式</value>
+  </data>
  <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
    <value>目標顯示器</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
@@ -337,6 +337,12 @@ namespace BetterLyrics.WinUI3
            UpdateDockOrDesktopWindow();
        }

+        [RelayCommand]
+        private void TogglePictureInPictureMode()
+        {
+            LiveStates.ToggleLyricsWindowMode(LyricsWindowMode.PictureInPictureMode);
+        }
+
        [RelayCommand]
        private void OnImmersiveToggleButtonEnabledChanged()
        {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
@@ -256,34 +256,6 @@
                            </Button.ContextFlyout>
                        </Button>

-                        <!--  Display type  -->
-                        <Button
-                            x:Name="DisplayTypeSwitchButton"
-                            x:Uid="MainPageDisplayTypeSwitcher"
-                            Click="DisplayTypeSwitchButton_Click"
-                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                  Glyph=&#xF246;}"
-                            Style="{StaticResource GhostButtonStyle}">
-                            <ToolTipService.ToolTip>
-                                <ToolTip x:Name="PresentationTypeToolTip" x:Uid="LyricsPageDisplayTypeButtonToolTip" />
-                            </ToolTipService.ToolTip>
-                            <Button.ContextFlyout>
-                                <Flyout x:Name="DisplayTypeSwitchFlyout" ShouldConstrainToRootBounds="false">
-                                    <Flyout.FlyoutPresenterStyle>
-                                        <Style TargetType="FlyoutPresenter">
-                                            <Setter Property="Padding" Value="12,2,12,8" />
-                                            <Setter Property="CornerRadius" Value="8" />
-                                        </Style>
-                                    </Flyout.FlyoutPresenterStyle>
-                                    <RadioButtons MaxColumns="1" SelectedIndex="{x:Bind ViewModel.LiveStates.CurrentLyricsDisplayType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}">
-                                        <RadioButton x:Uid="MainPageAlbumArtOnly" />
-                                        <RadioButton x:Uid="MainPageLyriscOnly" />
-                                        <RadioButton x:Uid="MainPageSplitView" />
-                                    </RadioButtons>
-                                </Flyout>
-                            </Button.ContextFlyout>
-                        </Button>
-
                        <!--  Settings  -->
                        <Button
                            x:Name="SettingsButton"
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
@@ -48,11 +48,6 @@ namespace BetterLyrics.WinUI3.Views
            e.Handled = true;
        }

-        private void DisplayTypeSwitchButton_Click(object sender, RoutedEventArgs e)
-        {
-            DisplayTypeSwitchFlyout.ShowAt(BottomRightCommandStackPanel);
-        }
-
        private void PlaybackSettingsShortcutButton_Click(object sender, RoutedEventArgs e)
        {
            PlaybackSettingsFlyout.Content = new PlaybackSettingsControl
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -153,6 +153,7 @@ namespace BetterLyrics.WinUI3.Views

        private void MiniFlyoutItem_Click(object sender, RoutedEventArgs e)
        {
+            ViewModel.TogglePictureInPictureModeCommand.Execute(null);
            if (MiniFlyoutItem.IsChecked)
            {
                AppWindow.SetPresenter(AppWindowPresenterKind.CompactOverlay);