settings_re7

2026-06-22 09:14:25 +08:00 · 2026-03-14 16:38:56 +08:00
parent 8d4f00efcb
commit 91f9f3d6fb
14 changed files with 370 additions and 60 deletions
--- a/LanMountainDesktop/Views/MainWindow.SettingsHardCut.Stubs.cs
+++ b/LanMountainDesktop/Views/MainWindow.SettingsHardCut.Stubs.cs
@@ -15,6 +15,8 @@ using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
 using LanMountainDesktop.Theme;
 using LanMountainDesktop.Views.Components;
+using LibVLCSharp.Shared;
+using LibVLCSharp.Avalonia;

 namespace LanMountainDesktop.Views;

@@ -218,13 +220,24 @@ public partial class MainWindow
        _defaultDesktopBackground = GetThemeBrush("AdaptiveSurfaceBaseBrush");
    }

-    private void TryRestoreWallpaper(string? savedWallpaperPath)
+    private void TryRestoreWallpaper(string? savedWallpaperPath, string? type = null, string? color = null)
    {
        _wallpaperPath = string.IsNullOrWhiteSpace(savedWallpaperPath) ? null : savedWallpaperPath;
+        _wallpaperType = type ?? "Image";
+        if (TryParseColor(color, out var parsedColor))
+        {
+            _wallpaperSolidColor = parsedColor;
+        }

        _wallpaperBitmap?.Dispose();
        _wallpaperBitmap = null;

+        if (_wallpaperType == "SolidColor")
+        {
+            _wallpaperMediaType = WallpaperMediaType.SolidColor;
+            return;
+        }
+
        if (string.IsNullOrWhiteSpace(_wallpaperPath) || !File.Exists(_wallpaperPath))
        {
            _wallpaperMediaType = WallpaperMediaType.None;
@@ -232,7 +245,7 @@ public partial class MainWindow
        }

        var extension = Path.GetExtension(_wallpaperPath);
-        if (SupportedVideoExtensions.Contains(extension))
+        if (SupportedVideoExtensions.Contains(extension) || _wallpaperType == "Video")
        {
            _wallpaperMediaType = WallpaperMediaType.Video;
            _wallpaperVideoPath = _wallpaperPath;
@@ -263,6 +276,12 @@ public partial class MainWindow

    private void ApplyWallpaperBrush()
    {
+        if (_wallpaperMediaType == WallpaperMediaType.SolidColor && _wallpaperSolidColor.HasValue)
+        {
+            DesktopWallpaperLayer.Background = new SolidColorBrush(_wallpaperSolidColor.Value);
+            return;
+        }
+
        if (_wallpaperMediaType == WallpaperMediaType.Image && _wallpaperBitmap is not null)
        {
            DesktopWallpaperLayer.Background = new ImageBrush(_wallpaperBitmap)
@@ -277,16 +296,65 @@ public partial class MainWindow

    private void UpdateWallpaperDisplay()
    {
+        if (_wallpaperMediaType == WallpaperMediaType.Video)
+        {
+            if (!string.IsNullOrWhiteSpace(_wallpaperVideoPath))
+            {
+                StartVideoWallpaper(_wallpaperVideoPath);
+            }
+        }
+        else
+        {
+            StopVideoWallpaper();
+        }
+
        ApplyWallpaperBrush();
    }

+    private void StartVideoWallpaper(string videoPath)
+    {
+        if (string.IsNullOrWhiteSpace(videoPath) || !File.Exists(videoPath))
+        {
+            return;
+        }
+
+        try
+        {
+            _libVlc ??= new LibVLC();
+            _videoWallpaperPlayer ??= new MediaPlayer(_libVlc);
+
+            if (_videoWallpaperMedia?.Mrl != videoPath)
+            {
+                _videoWallpaperMedia?.Dispose();
+                _videoWallpaperMedia = new Media(_libVlc, new Uri(videoPath));
+                _videoWallpaperPlayer.Media = _videoWallpaperMedia;
+            }
+
+            if (DesktopVideoWallpaperView is { } videoView)
+            {
+                videoView.MediaPlayer = _videoWallpaperPlayer;
+                videoView.IsVisible = true;
+            }
+
+            if (!_videoWallpaperPlayer.IsPlaying)
+            {
+                _videoWallpaperPlayer.Play();
+            }
+        }
+        catch
+        {
+        }
+    }
+
    private void StopVideoWallpaper()
    {
-        _wallpaperVideoPath = null;
-        if (_wallpaperMediaType == WallpaperMediaType.Video)
+        if (DesktopVideoWallpaperView is { } videoView)
        {
-            _wallpaperMediaType = WallpaperMediaType.None;
+            videoView.IsVisible = false;
        }
+
+        _videoWallpaperPlayer?.Stop();
+        _wallpaperVideoPath = null;
    }

    private double CalculateCurrentBackgroundLuminance()
@@ -398,7 +466,7 @@ public partial class MainWindow
            InitializeDesktopSurfaceState(layoutSnapshot);
            InitializeLauncherVisibilitySettings(launcherSnapshot);
            InitializeDesktopComponentPlacements(layoutSnapshot);
-            TryRestoreWallpaper(snapshot.WallpaperPath);
+            TryRestoreWallpaper(snapshot.WallpaperPath, snapshot.WallpaperType, snapshot.WallpaperColor);
            if (TryParseColor(snapshot.ThemeColor, out var savedThemeColor))
            {
                _selectedThemeColor = savedThemeColor;
@@ -428,6 +496,8 @@ public partial class MainWindow
            IsNightMode = _isNightMode,
            ThemeColor = _selectedThemeColor.ToString(),
            WallpaperPath = _wallpaperPath,
+            WallpaperType = _wallpaperType,
+            WallpaperColor = _wallpaperSolidColor?.ToString(),
            LanguageCode = _languageCode,
            TimeZoneId = _timeZoneService.CurrentTimeZone.Id,
            WeatherLocationMode = _weatherLocationMode.ToString(),
--- a/LanMountainDesktop/Views/MainWindow.axaml
+++ b/LanMountainDesktop/Views/MainWindow.axaml
@@ -47,6 +47,12 @@
                            VerticalAlignment="Stretch"
                            Background="{DynamicResource AdaptiveSurfaceBaseBrush}" />

+                    <vlc:VideoView x:Name="DesktopVideoWallpaperView"
+                                   IsVisible="False"
+                                   IsHitTestVisible="False"
+                                   HorizontalAlignment="Stretch"
+                                   VerticalAlignment="Stretch" />
+
                    <Image x:Name="DesktopVideoWallpaperImage"
                           IsVisible="False"
                           IsHitTestVisible="False"
--- a/LanMountainDesktop/Views/MainWindow.axaml.cs
+++ b/LanMountainDesktop/Views/MainWindow.axaml.cs
@@ -45,7 +45,8 @@ public partial class MainWindow : Window, ISettingsWindowAnchorProvider
    {
        None,
        Image,
-        Video
+        Video,
+        SolidColor
    }

    private enum WeatherLocationMode
@@ -119,6 +120,8 @@ public partial class MainWindow : Window, ISettingsWindowAnchorProvider
    private Bitmap? _wallpaperBitmap;
    private WallpaperMediaType _wallpaperMediaType;
    private string? _wallpaperVideoPath;
+    private string _wallpaperType = "Image";
+    private Color? _wallpaperSolidColor;
    private LibVLC? _libVlc;
    private MediaPlayer? _videoWallpaperPlayer;
    private Media? _videoWallpaperMedia;
@@ -277,7 +280,7 @@ public partial class MainWindow : Window, ISettingsWindowAnchorProvider
        InitializeDesktopComponentPlacements(desktopLayoutSnapshot);
        InitializeSettingsIcons();

-        TryRestoreWallpaper(snapshot.WallpaperPath);
+        TryRestoreWallpaper(snapshot.WallpaperPath, snapshot.WallpaperType, snapshot.WallpaperColor);
        ApplyWallpaperBrush();
        UpdateWallpaperDisplay();

--- a/LanMountainDesktop/Views/SettingsPages/AppearanceSettingsPage.axaml
+++ b/LanMountainDesktop/Views/SettingsPages/AppearanceSettingsPage.axaml
@@ -36,9 +36,7 @@
                    <fi:SymbolIconSource Symbol="Color" />
                </ui:SettingsExpander.IconSource>
                <ui:SettingsExpander.Footer>
-                    <TextBox Watermark="#AABBCC"
-                             Width="180"
-                             Text="{Binding ThemeColor}" />
+                    <ColorPicker Color="{Binding ThemeColorPickerValue}" />
                </ui:SettingsExpander.Footer>
            </ui:SettingsExpander>

--- a/LanMountainDesktop/Views/SettingsPages/ComponentsSettingsPage.axaml
+++ b/LanMountainDesktop/Views/SettingsPages/ComponentsSettingsPage.axaml
@@ -20,25 +20,37 @@
                    <fi:SymbolIconSource Symbol="GridDots" />
                </ui:SettingsExpander.IconSource>
                <ui:SettingsExpanderItem>
-                    <Grid ColumnDefinitions="Auto,*">
+                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="16">
                        <TextBlock Text="{Binding ShortSideCellsLabel}"
                                   VerticalAlignment="Center" />
-                        <NumericUpDown Grid.Column="1"
-                                       Width="120"
-                                       Minimum="6"
-                                       Maximum="96"
-                                       Value="{Binding ShortSideCells}" />
+                        <Slider Grid.Column="1"
+                                Minimum="6"
+                                Maximum="96"
+                                IsSnapToTickEnabled="True"
+                                TickFrequency="1"
+                                Value="{Binding ShortSideCells}" />
+                        <TextBlock Grid.Column="2"
+                                   Width="32"
+                                   Text="{Binding ShortSideCells}"
+                                   VerticalAlignment="Center"
+                                   HorizontalAlignment="Right" />
                    </Grid>
                </ui:SettingsExpanderItem>
                <ui:SettingsExpanderItem>
-                    <Grid ColumnDefinitions="Auto,*">
+                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="16">
                        <TextBlock Text="{Binding EdgeInsetPercentLabel}"
                                   VerticalAlignment="Center" />
-                        <NumericUpDown Grid.Column="1"
-                                       Width="120"
-                                       Minimum="0"
-                                       Maximum="30"
-                                       Value="{Binding EdgeInsetPercent}" />
+                        <Slider Grid.Column="1"
+                                Minimum="0"
+                                Maximum="30"
+                                IsSnapToTickEnabled="True"
+                                TickFrequency="1"
+                                Value="{Binding EdgeInsetPercent}" />
+                        <TextBlock Grid.Column="2"
+                                   Width="32"
+                                   Text="{Binding EdgeInsetPercent, StringFormat='{}{0}%'}"
+                                   VerticalAlignment="Center"
+                                   HorizontalAlignment="Right" />
                    </Grid>
                </ui:SettingsExpanderItem>
                <ui:SettingsExpanderItem>
--- a/LanMountainDesktop/Views/SettingsPages/WallpaperSettingsPage.axaml
+++ b/LanMountainDesktop/Views/SettingsPages/WallpaperSettingsPage.axaml
@@ -9,34 +9,116 @@
    <ScrollViewer VerticalScrollBarVisibility="Auto">
        <StackPanel Classes="settings-page-container">

+            <!-- 预览与颜色选择区域 -->
+            <Grid ColumnDefinitions="*,*" ColumnSpacing="32" Margin="0,0,0,32">
+                <!-- 左侧：模拟屏幕预览 (占一半宽度) -->
+                <Border Grid.Column="0" VerticalAlignment="Top">
+                    <Viewbox Stretch="Uniform">
+                        <Border Width="1600" Height="900"
+                                Background="#080808" 
+                                BorderBrush="#1A1A1A" 
+                                BorderThickness="24" 
+                                CornerRadius="48"
+                                BoxShadow="0 12 32 #50000000">
+                            <Panel Background="{DynamicResource AdaptiveSurfaceBaseBrush}" Margin="2">
+                                <!-- 图片/视频预览 -->
+                                <Image Source="{Binding PreviewImage}" 
+                                       IsVisible="{Binding IsImageOrVideo}" 
+                                       Stretch="UniformToFill" />
+                                <!-- 纯色预览 -->
+                                <Border Background="{Binding SelectedColor}" 
+                                        IsVisible="{Binding IsSolidColor}" />
+                            </Panel>
+                        </Border>
+                    </Viewbox>
+                </Border>
+
+                <!-- 右侧：颜色选择网格 -->
+                <StackPanel Grid.Column="1" VerticalAlignment="Center" Spacing="12" IsVisible="{Binding IsSolidColor}">
+                    <TextBlock Text="{Binding WallpaperColorLabel}" 
+                               FontSize="14" 
+                               FontWeight="SemiBold" 
+                               Opacity="0.8" />
+                    <ItemsControl ItemsSource="{Binding PresetColors}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <UniformGrid Columns="4" Rows="3" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Button Width="48" Height="48" Margin="4" Padding="0"
+                                        Background="{Binding}"
+                                        BorderThickness="0"
+                                        CornerRadius="6"
+                                        Command="{Binding $parent[UserControl].((vm:WallpaperSettingsPageViewModel)DataContext).SelectColorCommand}"
+                                        CommandParameter="{Binding}"
+                                        ToolTip.Tip="{Binding}">
+                                    <!-- 简单的悬停与选中效果由 Button 默认样式提供，
+                                         由于使用了低饱和度颜色，背景色本身就很柔和 -->
+                                </Button>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
+            </Grid>
+
+            <Separator Classes="settings-separator" Margin="0,0,0,24" />
+
+            <!-- 基本设置项 -->
            <controls:IconText Icon="Image"
                               Text="{Binding WallpaperHeader}"
-                               Margin="0,0,0,4" />
+                               Margin="0,0,0,8" />

-            <ui:SettingsExpander Header="{Binding WallpaperPathLabel}">
+            <!-- 壁纸类型 -->
+            <ui:SettingsExpander Header="{Binding WallpaperTypeLabel}">
                <ui:SettingsExpander.IconSource>
-                    <fi:SymbolIconSource Symbol="Image" />
+                    <fi:SymbolIconSource Symbol="Layer" />
                </ui:SettingsExpander.IconSource>
                <ui:SettingsExpander.Footer>
-                    <Grid ColumnDefinitions="220,Auto"
-                          ColumnSpacing="8">
-                        <TextBox IsReadOnly="True"
-                                 Grid.Column="0"
-                                 Text="{Binding WallpaperPath}" />
-                        <Button Grid.Column="1"
-                                Click="OnBrowseWallpaperClick"
-                                Content="{Binding ImportWallpaperButtonText}" />
-                    </Grid>
+                    <ComboBox Width="200"
+                              ItemsSource="{Binding WallpaperTypes}"
+                              SelectedItem="{Binding SelectedWallpaperType}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="vm:SelectionOption">
+                                <TextBlock Text="{Binding Label}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
                </ui:SettingsExpander.Footer>
            </ui:SettingsExpander>

+            <!-- 图片/视频文件选择 -->
+            <ui:SettingsExpander Header="{Binding WallpaperPathLabel}" 
+                                 IsVisible="{Binding IsImageOrVideo}"
+                                 Margin="0,4,0,0">
+                <ui:SettingsExpander.IconSource>
+                    <fi:SymbolIconSource Symbol="FolderOpen" />
+                </ui:SettingsExpander.IconSource>
+                <ui:SettingsExpander.Footer>
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <TextBox IsReadOnly="True"
+                                 Width="300"
+                                 Text="{Binding WallpaperPath}"
+                                 VerticalAlignment="Center" />
+                        <Button Click="OnBrowseWallpaperClick"
+                                Classes="accent"
+                                Content="{Binding ImportWallpaperButtonText}"
+                                VerticalAlignment="Center" />
+                    </StackPanel>
+                </ui:SettingsExpander.Footer>
+            </ui:SettingsExpander>
+
+            <!-- 填充方式 -->
            <ui:SettingsExpander Header="{Binding WallpaperPlacementLabel}"
-                                 Description="{Binding WallpaperPlacementDescription}">
+                                 Description="{Binding WallpaperPlacementDescription}"
+                                 IsVisible="{Binding IsImageOrVideo}"
+                                 Margin="0,4,0,0">
                <ui:SettingsExpander.IconSource>
                    <fi:SymbolIconSource Symbol="Maximize" />
                </ui:SettingsExpander.IconSource>
                <ui:SettingsExpander.Footer>
-                    <ComboBox Width="180"
+                    <ComboBox Width="200"
                              ItemsSource="{Binding WallpaperPlacements}"
                              SelectedItem="{Binding SelectedWallpaperPlacement}">
                        <ComboBox.ItemTemplate>
--- a/LanMountainDesktop/Views/SettingsWindow.axaml
+++ b/LanMountainDesktop/Views/SettingsWindow.axaml
@@ -29,7 +29,7 @@

        <Style Selector="TextBlock.page-title-text">
            <Setter Property="FontSize" Value="28" />
-            <Setter Property="FontWeight" Value="Normal" />
+            <Setter Property="FontWeight" Value="SemiBold" />
        </Style>

        <Style Selector="TextBlock.page-title-text:narrow">