Procházet zdrojové kódy

Palette viewer Improvements and name fix

Krzysztof Krysiński před 2 týdny
rodič
revize
d906ae0dec

+ 1 - 2
src/PixiEditor/Helpers/PaletteHelpers.cs

@@ -31,10 +31,9 @@ internal static class PaletteHelpers
 
         foreach (var parser in parsers)
         {
-            string supportedFormats = string.Join(';', parser.SupportedFileExtensions).Replace(".", "*.");
             filePickerFileTypes.Add(new FilePickerFileType($"{parser.FileName}")
             {
-                Patterns = parser.SupportedFileExtensions
+                Patterns = parser.SupportedFileExtensions.Select(x => x.Replace(".", "*.")).ToList()
             });
         }
 

+ 5 - 1
src/PixiEditor/Views/Input/EditableTextBlock.axaml.cs

@@ -74,10 +74,13 @@ internal partial class EditableTextBlock : UserControl
         set => SetValue(TextProperty, value);
     }
 
+    private string oldText;
+
     public void EnableEditing()
     {
         ShortcutController.BlockShortcutExecution("EditableTextBlock");
         TextBlockVisibility = false;
+        oldText = textBox.Text;
         IsEditing = true;
 
         Dispatcher.UIThread.Post(
@@ -93,7 +96,8 @@ internal partial class EditableTextBlock : UserControl
         TextBlockVisibility = true;
         ShortcutController.UnblockShortcutExecution("EditableTextBlock");
         IsEditing = false;
-        OnSubmit?.Invoke(this, new TextChangedEventArgs(textBox.Text, Text));
+        OnSubmit?.Invoke(this, new TextChangedEventArgs(Text, oldText));
+        oldText = Text;
     }
 
     private static void OnIsEditingChanged(AvaloniaPropertyChangedEventArgs<bool> e)

+ 4 - 6
src/PixiEditor/Views/Palettes/PaletteViewer.axaml.cs

@@ -351,12 +351,10 @@ internal partial class PaletteViewer : UserControl
                 int currIndex = Colors.IndexOf(paletteColor);
                 if (paletteColorControl != null)
                 {
-                    int newIndex = Colors.IndexOf(paletteColorControl.Color);
-                    Colors.RemoveAt(currIndex);
-                    Colors.Insert(newIndex, paletteColor);
-                    int indexOfSource = Colors.IndexOf(paletteColorControl.Color);
-                    if(indexOfSource < 0) return;
-                    Colors.Move(indexOfSource, currIndex);
+                    int indexOfControl = Colors.IndexOf(paletteColorControl.Color);
+                    indexOfControl = Math.Clamp(indexOfControl, 0, Colors.Count - 1);
+                    Colors.Move(currIndex, indexOfControl);
+                    RefreshAllItems();
                 }
             }
         }