Profile tree - Fixed dragging while renaming

Profile tree - Fixed dragging folders onto themselves Profile tree - Suspend keybinds while renaming Brushes - Added brush presets UI Numberbox - Removed double validation error
2026-11-12 03:48:56 +00:00 · 2022-07-23 21:21:57 +02:00
1 parent a23af68a12
commit 29ef160975
@@ -0,0 +1,64 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:dialogs="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs"
+             xmlns:layerBrushes="clr-namespace:Artemis.Core.LayerBrushes;assembly=Artemis.Core"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetView"
+             x:DataType="dialogs:LayerBrushPresetViewModel"
+             Width="500">
+  <Grid RowDefinitions="Auto,*">
+        <TextBox Name="SearchBox" Text="{CompiledBinding SearchText}" Margin="0 0 0 15" Watermark="Search" />
+        <ListBox Name="EffectDescriptorsList"
+                 Grid.Row="1"
+                 Items="{CompiledBinding Presets}"
+                 IsVisible="{CompiledBinding Presets.Count}"
+                 Height="300">
+
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type layerBrushes:ILayerBrushPreset}">
+                    <Grid RowDefinitions="Auto,*"
+                          ColumnDefinitions="Auto,Auto"
+                          Background="Transparent"
+                          PointerReleased="InputElement_OnPointerReleased"
+                          Margin="0 4"
+                          VerticalAlignment="Center">
+                        <shared:ArtemisIcon Grid.Column="0"
+                                            Grid.RowSpan="2"
+                                            Icon="{CompiledBinding Icon}"
+                                            Width="24"
+                                            Height="24"
+                                            VerticalAlignment="Center"
+                                            Margin="0 0 15 0" />
+                        <TextBlock Grid.Column="1"
+                                   Grid.Row="0"
+                                   Classes="BodyStrongTextBlockStyle"
+                                   Text="{CompiledBinding Name}"
+                                   VerticalAlignment="Bottom"
+                                   Width="450"
+                                   TextWrapping="Wrap" />
+                        <TextBlock Grid.Column="1"
+                                   Grid.Row="1"
+                                   Foreground="{DynamicResource TextFillColorSecondary}"
+                                   Text="{CompiledBinding Description}"
+                                   VerticalAlignment="Top"
+                                   Width="450"
+                                   TextWrapping="Wrap" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <Grid Grid.Row="1" Height="300">
+            <StackPanel VerticalAlignment="Center"
+                        Spacing="20"
+                        IsVisible="{CompiledBinding !Presets.Count}">
+                <avalonia:MaterialIcon Kind="CloseCircle" Width="32" Height="32" />
+                <TextBlock Classes="h5" TextAlignment="Center">None of the presets match your search</TextBlock>
+            </StackPanel>
+        </Grid>
+
+    </Grid>
+</UserControl>
@@ -0,0 +1,29 @@
+using Artemis.Core.LayerBrushes;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs;
+
+public partial class LayerBrushPresetView : ReactiveUserControl<LayerBrushPresetViewModel>
+{
+    public LayerBrushPresetView()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        if (sender is not IDataContextProvider {DataContext: ILayerBrushPreset preset} || ViewModel == null)
+            return;
+
+        ViewModel?.SelectPreset(preset);
+    }
+}
@@ -1,14 +1,61 @@
-using Artemis.Core.LayerBrushes;
+using System;
+using System.Collections.ObjectModel;
+using System.Reactive.Linq;
+using Artemis.Core;
+using Artemis.Core.LayerBrushes;
+using Artemis.Core.LayerEffects;
+using Artemis.Core.Services;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services.ProfileEditor;
+using Artemis.UI.Shared.Services.ProfileEditor.Commands;
+using DynamicData;
+using ReactiveUI;

 namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs;

 public class LayerBrushPresetViewModel : ContentDialogViewModelBase
 {
+    private readonly BaseLayerBrush _layerBrush;
+    private string? _searchText;
+
    public LayerBrushPresetViewModel(BaseLayerBrush layerBrush)
    {
-        LayerBrush = layerBrush;
+        _layerBrush = layerBrush;
+
+        SourceList<ILayerBrushPreset> presetsSourceList = new();
+        if (layerBrush.Presets != null)
+            presetsSourceList.AddRange(layerBrush.Presets);
+        IObservable<Func<ILayerBrushPreset, bool>> presetsFilter = this.WhenAnyValue(vm => vm.SearchText).Select(CreatePredicate);
+
+        presetsSourceList.Connect()
+            .Filter(presetsFilter)
+            .Bind(out ReadOnlyObservableCollection<ILayerBrushPreset> presets)
+            .Subscribe();
+        Presets = presets;
    }

-    public BaseLayerBrush LayerBrush { get; }
+    public ReadOnlyObservableCollection<ILayerBrushPreset> Presets { get; }
+
+    public string? SearchText
+    {
+        get => _searchText;
+        set => RaiseAndSetIfChanged(ref _searchText, value);
+    }
+
+    public void SelectPreset(ILayerBrushPreset preset)
+    {
+        _layerBrush.BaseProperties?.ResetAllLayerProperties();
+        preset.Apply();
+        ContentDialog?.Hide();
+    }
+    
+    private Func<ILayerBrushPreset, bool> CreatePredicate(string? search)
+    {
+        if (string.IsNullOrWhiteSpace(search))
+            return _ => true;
+
+        search = search.Trim();
+        return data => data.Name.Contains(search, StringComparison.InvariantCultureIgnoreCase) ||
+                       data.Description.Contains(search, StringComparison.InvariantCultureIgnoreCase);
+    }
 }
@@ -9,7 +9,8 @@
                     x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Windows.BrushConfigurationWindowView"
                     Title="Artemis | Brush configuration"
                     Width="{Binding Configuration.DialogWidth}"
-                     Height="{Binding Configuration.DialogHeight}">
+                     Height="{Binding Configuration.DialogHeight}"
+                     WindowStartupLocation="CenterOwner">
    <Panel>
        <ContentControl Content="{Binding ConfigurationViewModel}" />
    </Panel>
@@ -9,7 +9,8 @@
                     x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Windows.EffectConfigurationWindowView"
                     Title="Artemis | Effect configuration"
                     Width="{Binding Configuration.DialogWidth}"
-                     Height="{Binding Configuration.DialogHeight}">
+                     Height="{Binding Configuration.DialogHeight}"
+                     WindowStartupLocation="CenterOwner">
    <Panel>
        <ContentControl Content="{Binding ConfigurationViewModel}" />
    </Panel>