v3.0.0.43 - Fix paste not being detected in Tag TextBox and Tag Warni…

…ng label in grid.
e621-ReBot · Nov 9, 2024 · 88ddef5 · 88ddef5
1 parent 0a3a69e
commit 88ddef5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 34 deletions.
diff --git a/e621 ReBot v3/Windows/Window_Tagger.xaml.cs b/e621 ReBot v3/Windows/Window_Tagger.xaml.cs
@@ -231,7 +231,36 @@ private void Tags_TextBox_KeyDown(object sender, KeyEventArgs e)
                         e.Handled = true;
                         return;
                     }
-                case Key.V:
+            }
+        }
+
+        private void Tags_TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Space:
+                    {
+                        if (Tags_TextBox.Text.Substring(Tags_TextBox.SelectionStart - 1, 1).Equals(" "))
+                        {
+                            e.Handled = true;
+                            break;
+                        }
+                        if (Tags_TextBox.SelectionStart + 1 <= Tags_TextBox.Text.Length && Tags_TextBox.Text.Substring(Tags_TextBox.SelectionStart, 1).Equals(" "))
+                        {
+                            e.Handled = true;
+                            break;
+                        }
+                        Dispatcher.BeginInvoke(CountTags);
+                        break;
+                    }
+                case Key.Back:
+                case Key.Delete:
+                    {
+                        Dispatcher.BeginInvoke(CountTags);
+                        break;
+                    }
+
+                case Key.V: //Doesn't work in KeyDown
                     {
                         if (Keyboard.Modifiers.HasFlag(ModifierKeys.Control))
                         {
@@ -255,7 +284,7 @@ private void Tags_TextBox_KeyDown(object sender, KeyEventArgs e)
                                         }
                                     }
                                     SortTags.AddRange(PasteTags);
-                                    Tags_TextBox.Text += $"{string.Join(' ', SortTags)} ";
+                                    Tags_TextBox.Text = $"{string.Join(' ', SortTags)} ";
                                 }
                                 Tags_TextBox.SelectionStart = Tags_TextBox.Text.Length;
                                 CountTags();
@@ -267,34 +296,6 @@ private void Tags_TextBox_KeyDown(object sender, KeyEventArgs e)
             }
         }
 
-        private void Tags_TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Space:
-                    {
-                        if (Tags_TextBox.Text.Substring(Tags_TextBox.SelectionStart - 1, 1).Equals(" "))
-                        {
-                            e.Handled = true;
-                            break;
-                        }
-                        if (Tags_TextBox.SelectionStart + 1 <= Tags_TextBox.Text.Length && Tags_TextBox.Text.Substring(Tags_TextBox.SelectionStart, 1).Equals(" "))
-                        {
-                            e.Handled = true;
-                            break;
-                        }
-                        Dispatcher.BeginInvoke(CountTags);
-                        break;
-                    }
-                case Key.Back:
-                case Key.Delete:
-                    {
-                        Dispatcher.BeginInvoke(CountTags);
-                        break;
-                    }
-            }
-        }
-
         private void Tags_TextBox_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             CursorClickChange = true;
@@ -326,9 +327,12 @@ private void AddTags()
             Tags_TextBox.Text = string.Join(' ', SortTags).ToLower();
 
             if (ReferenceEquals(Owner, Window_Preview._RefHolder)) Window_Preview._RefHolder.Tags_TextBlock.Text = Tags_TextBox.Text;
-            GridVE GridVETemp = Module_Grabber.IsVisibleInGrid(MediaItemHolder);
-            if (GridVETemp != null) GridVETemp.cTagWarning_TextBlock.Visibility = SortTags.Count < 8 ? Visibility.Visible : Visibility.Hidden;
-            TagsAdded = true;
+            if (MediaItemHolder.UP_UploadedID == null)
+            {
+                GridVE GridVETemp = Module_Grabber.IsVisibleInGrid(MediaItemHolder);
+                if (GridVETemp != null) GridVETemp.cTagWarning_TextBlock.Visibility = SortTags.Count < 16 ? Visibility.Visible : Visibility.Hidden;
+                TagsAdded = true;
+            }
         }
 
         private void TB_Description_Click(object sender, RoutedEventArgs e)

diff --git a/e621 ReBot v3/e621 ReBot v3.csproj b/e621 ReBot v3/e621 ReBot v3.csproj
@@ -11,7 +11,7 @@
     <ApplicationIcon>Resources\ReBot_Icon.ico</ApplicationIcon>
     <Platforms>x64</Platforms>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-    <FileVersion>3.0.0.42</FileVersion>
+    <FileVersion>3.0.0.43</FileVersion>
     <StartupObject>e621_ReBot_v3.App</StartupObject>
     <IsPublishable>False</IsPublishable>
     <RepositoryUrl>https://github.com/e621-ReBot/e621-ReBot-v3</RepositoryUrl>