From f1a5e646176bdf5b286702fb42e0afb67a60cdc3 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Thu, 26 May 2022 17:14:16 +0800
Subject: [PATCH] =?UTF-8?q?:children=5Fcrossing:=20=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=E8=89=B2=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Other/GradientBGDialog.xaml    | 102 ++++++++++++++-----------
 Control/Other/GradientBGDialog.xaml.cs |  19 ++++-
 ViewModel/Temp/GradientBGParamList.cs  |   5 +-
 3 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/Control/Other/GradientBGDialog.xaml b/Control/Other/GradientBGDialog.xaml
index e5a6216..8e9bb3f 100644
--- a/Control/Other/GradientBGDialog.xaml
+++ b/Control/Other/GradientBGDialog.xaml
@@ -3,56 +3,72 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:hc="https://handyorg.github.io/handycontrol"
         CornerRadius="4"
-        Width="600"
-        Height="400"
-        Style="{StaticResource BorderBG}"
         >
-    <hc:TransitioningContentControl TransitionMode="Fade">
-        <Grid>
-            <ListBox x:Name="GradientBGs"
+    <Grid>
+        <StackPanel>
+            <Grid Width="750"
+                  Height="550"
+                  Panel.ZIndex="0"
+                  MouseDown="DragMove"
+                  >
+                <Grid.Background>
+                    <SolidColorBrush Color="Black" Opacity="0.01"/>
+                </Grid.Background>
+            </Grid>
+            <hc:TransitioningContentControl TransitionMode="Fade"
+                                            Panel.ZIndex="99"
+                                            Width="600"
+                                            Height="400"
+                                            Margin="0,-620,0,0">
+                <Border Style="{StaticResource BorderBG}">
+                    <Grid>
+                        <ListBox x:Name="GradientBGs"
                      ItemsSource="{Binding}"
                      Background="Transparent"
                      Margin="20,20,20,50"
                      BorderThickness="0"
                      >
-                <ListBox.ItemContainerStyle>
-                    <Style TargetType="ListBoxItem">
-                        <Setter Property="Margin" Value="10"/>
-                        <Setter Property="Effect" Value="{StaticResource EffectShadow2}"/>
-                        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                    </Style>
-                </ListBox.ItemContainerStyle>
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <WrapPanel Background="Transparent"/>
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <Border CornerRadius="4" Width="100" Height="100"
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem">
+                                    <Setter Property="Margin" Value="10"/>
+                                    <Setter Property="Effect" Value="{StaticResource EffectShadow2}"/>
+                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+                            <ListBox.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <WrapPanel Background="Transparent"/>
+                                </ItemsPanelTemplate>
+                            </ListBox.ItemsPanel>
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <Border CornerRadius="4" Width="100" Height="100"
                                 MouseLeftButtonDown="BGBorder_MouseLeftButtonDown"
                                 Tag="{Binding}">
-                            <Border.Background>
-                                <LinearGradientBrush>
-                                    <GradientStop Offset="0" Color="{Binding Color1}"/>
-                                    <GradientStop Offset="1" Color="{Binding Color2}"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
-                            <Border Width="100" Height="30" VerticalAlignment="Bottom">
-                                <Border.Background>
-                                    <SolidColorBrush Color="Gray" Opacity="0.4"/>
-                                </Border.Background>
-                                <TextBlock Text="{Binding Name}"  TextAlignment="Center" VerticalAlignment="Center" FontSize="17" FontWeight="Bold" Foreground="White"/>
-                            </Border>
-                        </Border>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+                                        <Border.Background>
+                                            <LinearGradientBrush>
+                                                <GradientStop Offset="0" Color="{Binding Color1}"/>
+                                                <GradientStop Offset="1" Color="{Binding Color2}"/>
+                                            </LinearGradientBrush>
+                                        </Border.Background>
+                                        <Border Width="100" Height="30" VerticalAlignment="Bottom">
+                                            <Border.Background>
+                                                <SolidColorBrush Color="Gray" Opacity="0.4"/>
+                                            </Border.Background>
+                                            <TextBlock Text="{Binding Name}"  TextAlignment="Center" VerticalAlignment="Center" FontSize="17" FontWeight="Bold" Foreground="White"/>
+                                        </Border>
+                                    </Border>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
 
-            <hc:UniformSpacingPanel Spacing="10"  Grid.ColumnSpan="4">
-                <Button Content="关闭" Style="{StaticResource Btn1}" Click="Close_Click" HorizontalAlignment="Stretch" Margin="524,360,-524,10" VerticalAlignment="Stretch"/>
-            </hc:UniformSpacingPanel>
-        </Grid>
-        
-    </hc:TransitioningContentControl>
+                        <hc:UniformSpacingPanel Spacing="10"  Grid.ColumnSpan="4">
+                            <Button Content="关闭" Style="{StaticResource Btn1}" Click="Close_Click" HorizontalAlignment="Stretch" Margin="524,360,-524,10" VerticalAlignment="Stretch"/>
+                        </hc:UniformSpacingPanel>
+                    </Grid>
+                </Border>
+
+            </hc:TransitioningContentControl>
+        </StackPanel>
+    </Grid>
 </Border>
\ No newline at end of file
diff --git a/Control/Other/GradientBGDialog.xaml.cs b/Control/Other/GradientBGDialog.xaml.cs
index 401d2b7..d13a8ee 100644
--- a/Control/Other/GradientBGDialog.xaml.cs
+++ b/Control/Other/GradientBGDialog.xaml.cs
@@ -3,7 +3,7 @@ using GeekDesk.ViewModel;
 using GeekDesk.ViewModel.Temp;
 using System.Windows;
 using System.Windows.Controls;
-
+using System.Windows.Input;
 
 namespace GeekDesk.Control.Other
 {
@@ -31,5 +31,22 @@ namespace GeekDesk.Control.Other
             MainWindow.appData.AppConfig.GradientBGParam = bgParam;
             BGSettingUtil.BGSetting();
         }
+
+        /// <summary>
+        /// 移动窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                Window.GetWindow(this).DragMove();
+            }
+        }
+
+
+
+
     }
 }
diff --git a/ViewModel/Temp/GradientBGParamList.cs b/ViewModel/Temp/GradientBGParamList.cs
index 87b3e0d..00d81fb 100644
--- a/ViewModel/Temp/GradientBGParamList.cs
+++ b/ViewModel/Temp/GradientBGParamList.cs
@@ -13,10 +13,9 @@ namespace GeekDesk.ViewModel.Temp
             //gradientBGParams = (ObservableCollection<GradientBGParam>)ConfigurationManager.GetSection("SystemBGs")
             gradientBGParams = new ObservableCollection<GradientBGParam>
             {
-                new GradientBGParam("诸神黄昏", "#FCCF31", "#F55555"),
-                new GradientBGParam ("森林之友", "#EBF7E3", "#A8E4C0"),
                 new GradientBGParam("魅惑妖术", "#FFDDE1", "#EE9CA7"),
-                new GradientBGParam("魅惑妖术", "#D2F6FF", "#91B0E4")
+                new GradientBGParam ("森林之友", "#EBF7E3", "#A8E4C0"),
+                new GradientBGParam("完美谢幕", "#D76D77", "#FFAF7B")
             };
         }