Merge pull request #59 from Stuff-Mods/settings-gui

Some UI enhancements to settings
DevilPepper · May 15, 2021 · 746dede · 746dede
2 parents 61c2479 + 169fa44
commit 746dede
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/ItemBoxTracker/ItemBoxTracker.csproj b/ItemBoxTracker/ItemBoxTracker.csproj
@@ -75,6 +75,9 @@
     <PackageReference
         Include="Microsoft.Xaml.Behaviors.Wpf"
         Version="1.1.31" />
+    <PackageReference
+        Include="gong-wpf-dragdrop"
+        Version="2.3.2" />
   </ItemGroup>
 
   <!-- Build tools -->

diff --git a/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml b/ItemBoxTracker/src/Plugin/Views/TrackingTabView.xaml
@@ -5,6 +5,7 @@
     xmlns:src="clr-namespace:HunterPie.GUI;assembly=HunterPie.UI"
     xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls;assembly=HunterPie.UI"
     xmlns:convert="clr-namespace:MHWItemBoxTracker.Converter"
+    xmlns:dd="urn:gong-wpf-dragdrop"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -61,7 +62,9 @@
             Style="{StaticResource buttons_settings}" />
         <ItemsControl
             ItemsSource="{Binding Model.Tracking, Mode=TwoWay}"
-            BorderThickness="0">
+            BorderThickness="0"
+            dd:DragDrop.IsDragSource="True"
+            dd:DragDrop.IsDropTarget="True">
           <ItemsControl.Background>
             <SolidColorBrush
                 Color="#00000000"
@@ -70,16 +73,10 @@
           <ItemsControl.ItemTemplate>
             <DataTemplate>
               <StackPanel Orientation="Horizontal">
-                <Button
-                    ToolTip="Move up"
-                    Command="{Binding DataContext.MoveUp, RelativeSource={RelativeSource AncestorType=UserControl}}"
-                    CommandParameter="{Binding}"
-                    Content="▲" />
-                <Button
-                    ToolTip="Move down"
-                    Command="{Binding DataContext.MoveDown, RelativeSource={RelativeSource AncestorType=UserControl}}"
-                    CommandParameter="{Binding}"
-                    Content="▼" />
+                <TextBlock
+                    Padding="10 0 5 0"
+                    Text="≡"
+                    Cursor="Hand" />
                 <local:AutoSuggestBox
                     Placeholder="Search items..."
                     NoResultsText="{Binding DataContext.Items.Count, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={convert:CountToString Zero=Please launch the game to enable this search and then reload this screen once HunterPie has loaded the strings, More=No Results...}}"
@@ -103,10 +100,13 @@
                     Text="{Binding Amount, Mode=TwoWay}" />
                 <Button
                     ToolTip="Delete row"
-                    Foreground="Red"
                     Command="{Binding DataContext.DeleteRow, RelativeSource={RelativeSource AncestorType=UserControl}}"
-                    CommandParameter="{Binding}"
-                    Content="✘" />
+                    CommandParameter="{Binding}">
+                  <Image
+                      Source="{StaticResource ICON_REMOVE}"
+                      Width="16"
+                      Height="16" />
+                </Button>
               </StackPanel>
             </DataTemplate>
           </ItemsControl.ItemTemplate>

diff --git a/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml b/ItemBoxTracker/src/Shareables/Views/AutoSuggestBox.xaml
@@ -73,7 +73,6 @@
         </TextBox>
 
         <Border
-            Grid.Column='0'
             CornerRadius="5"
             Background="#1e5878"
             Visibility="{Binding IsEnabled, Converter={StaticResource InverseBool2Visibility}}">
@@ -89,7 +88,7 @@
                 Grid.Column='1'
                 Foreground="#cc9E9D9D"
                 Command="{Binding OnClear}"
-                Content="✘" />
+                Content="✕" />
           </Grid>
         </Border>
 

diff --git a/scripts/gen-module-json.csx b/scripts/gen-module-json.csx
@@ -19,6 +19,7 @@ var buildDirectory = $"ItemBoxTracker/bin/{configuration}";
 var files = new List<string>() {
     "ItemBoxTracker.dll",
     "Microsoft.Xaml.Behaviors.dll",
+    "GongSolutions.WPF.DragDrop.dll",
 };
 
 var main = new Main();