From c1ef7c141fa7caaac04f3faedfc86eeb5e949aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= <huiyadanli@gmail.com>
Date: Sun, 3 Nov 2024 00:04:54 +0800
Subject: [PATCH] + drag drop

---
 .../BetterGenshinImpact.csproj                |  2 +-
 .../View/Pages/OneDragonFlowPage.xaml         |  4 +++-
 .../View/Pages/ScriptControlPage.xaml         |  2 ++
 .../View/Pages/View/PathingConfigView.xaml    | 19 +++++++++++++++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj
index 85df14b3..7ef50887 100644
--- a/BetterGenshinImpact/BetterGenshinImpact.csproj
+++ b/BetterGenshinImpact/BetterGenshinImpact.csproj
@@ -10,7 +10,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<ApplicationIcon>Assets\Images\logo.ico</ApplicationIcon>
 		<AssemblyName>BetterGI</AssemblyName>
-		<AssemblyVersion>0.35.4</AssemblyVersion>
+		<AssemblyVersion>0.35.5</AssemblyVersion>
 		<Platforms>x64</Platforms>
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
diff --git a/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml
index 2ba996d6..3faca674 100644
--- a/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml
+++ b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml
@@ -57,9 +57,11 @@
                                          Width="10"
                                          Height="10"
                                          Margin="10,0,10,0"
-                                         Fill="{Binding StatusColor}" />
+                                         Fill="{Binding StatusColor}"
+                                         IsHitTestVisible="False" />
                                 <TextBlock Grid.Column="2"
                                            VerticalAlignment="Center"
+                                           IsHitTestVisible="False"
                                            Text="{Binding Name}" />
                                 <ui:ToggleSwitch Grid.Column="3" IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
                             </Grid>
diff --git a/BetterGenshinImpact/View/Pages/ScriptControlPage.xaml b/BetterGenshinImpact/View/Pages/ScriptControlPage.xaml
index 89a66335..0bdae214 100644
--- a/BetterGenshinImpact/View/Pages/ScriptControlPage.xaml
+++ b/BetterGenshinImpact/View/Pages/ScriptControlPage.xaml
@@ -49,6 +49,7 @@
                 <ui:ListView Grid.Row="1"
                              dd:DragDrop.IsDragSource="True"
                              dd:DragDrop.IsDropTarget="True"
+                             dd:DragDrop.UseDefaultDragAdorner="True"
                              ItemsSource="{Binding ScriptGroups, Mode=TwoWay}"
                              SelectedItem="{Binding SelectedScriptGroup, Mode=TwoWay}"
                              SelectionMode="Single">
@@ -215,6 +216,7 @@
                              VerticalAlignment="Stretch"
                              dd:DragDrop.IsDragSource="True"
                              dd:DragDrop.IsDropTarget="True"
+                             dd:DragDrop.UseDefaultDragAdorner="True"
                              ItemsSource="{Binding SelectedScriptGroup.Projects, Mode=TwoWay}"
                              SelectionMode="Single">
                     <ListView.View>
diff --git a/BetterGenshinImpact/View/Pages/View/PathingConfigView.xaml b/BetterGenshinImpact/View/Pages/View/PathingConfigView.xaml
index 4df0087e..2d2de633 100644
--- a/BetterGenshinImpact/View/Pages/View/PathingConfigView.xaml
+++ b/BetterGenshinImpact/View/Pages/View/PathingConfigView.xaml
@@ -3,6 +3,7 @@
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:dd="urn:gong-wpf-dragdrop"
                  xmlns:local="clr-namespace:BetterGenshinImpact.Model"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  xmlns:sdl="http://schemas.sdl.com/xaml"
@@ -44,10 +45,17 @@
                                       FontTypography="BodyStrong"
                                       Text="队伍切换设置" />
                         <!--  使用ItemsControl来动态显示筛选条件  -->
-                        <ItemsControl ItemsSource="{Binding Config.PathingConditionConfig.PartyConditions, Mode=TwoWay}">
+                        <ItemsControl dd:DragDrop.IsDragSource="True"
+                                      dd:DragDrop.IsDropTarget="True"
+                                      dd:DragDrop.UseDefaultDragAdorner="True"
+                                      ItemsSource="{Binding Config.PathingConditionConfig.PartyConditions, Mode=TwoWay}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <WrapPanel Margin="0,0,0,10">
+                                        <ui:FontIcon Margin="0,0,15,0"
+                                                     FontSize="20"
+                                                     Glyph="&#xe411;"
+                                                     Style="{StaticResource FaFontIconStyleForOneDragon}" />
                                         <!--  采集物、路径动作  -->
                                         <ComboBox MinWidth="100"
                                                   Margin="0,0,10,5"
@@ -119,10 +127,17 @@
                                       FontTypography="BodyStrong"
                                       Text="角色设置（存在多个符合条件的角色情况下，优先使用游戏内编队编号更小的）" />
                         <!--  使用ItemsControl来动态显示筛选条件  -->
-                        <ItemsControl ItemsSource="{Binding Config.PathingConditionConfig.AvatarConditions, Mode=TwoWay}">
+                        <ItemsControl dd:DragDrop.IsDragSource="True"
+                                      dd:DragDrop.IsDropTarget="True"
+                                      dd:DragDrop.UseDefaultDragAdorner="True"
+                                      ItemsSource="{Binding Config.PathingConditionConfig.AvatarConditions, Mode=TwoWay}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <WrapPanel Margin="0,0,0,10">
+                                        <ui:FontIcon Margin="0,0,15,0"
+                                                     FontSize="20"
+                                                     Glyph="&#xe411;"
+                                                     Style="{StaticResource FaFontIconStyleForOneDragon}" />
                                         <!--  角色  -->
                                         <ComboBox MinWidth="100"
                                                   Margin="0,0,10,5"