Browse Source

Fixed expanding group on double click

flabbet 4 years ago
parent
commit
194730b377

+ 1 - 1
PixiEditor/Views/UserControls/LayerGroupControl.xaml.cs

@@ -263,6 +263,6 @@ namespace PixiEditor.Views.UserControls
 
 
                 IsVisibleUndoTriggerable = value;
                 IsVisibleUndoTriggerable = value;
             }
             }
-        }
+        }
     }
     }
 }
 }

+ 1 - 1
PixiEditor/Views/UserControls/LayersManager.xaml

@@ -57,7 +57,7 @@
             </StackPanel>
             </StackPanel>
         </DockPanel>
         </DockPanel>
         <Separator Grid.Row="1" Margin="0,-12, 0, 0" BorderBrush="{StaticResource DarkerAccentColor}" BorderThickness="2" />
         <Separator Grid.Row="1" Margin="0,-12, 0, 0" BorderBrush="{StaticResource DarkerAccentColor}" BorderThickness="2" />
-        <TreeView Name="treeView" Grid.Row="2" Margin="0, -12, 0, 0" ItemsSource="{Binding LayerTreeRoot, ElementName=layersManager}"  SelectedItemChanged="TreeView_SelectedItemChanged">
+        <TreeView TreeViewItem.PreviewMouseLeftButtonDown="TreeView_PreviewMouseLeftButtonDown"  Name="treeView" Grid.Row="2" Margin="0, -12, 0, 0" ItemsSource="{Binding LayerTreeRoot, ElementName=layersManager}"  SelectedItemChanged="TreeView_SelectedItemChanged">
                 <TreeView.ItemsPanel>
                 <TreeView.ItemsPanel>
                     <ItemsPanelTemplate>
                     <ItemsPanelTemplate>
                         <ui:ReversedOrderStackPanel/>
                         <ui:ReversedOrderStackPanel/>

+ 14 - 2
PixiEditor/Views/UserControls/LayersManager.xaml.cs

@@ -14,7 +14,7 @@ namespace PixiEditor.Views.UserControls
     /// </summary>
     /// </summary>
     public partial class LayersManager : UserControl
     public partial class LayersManager : UserControl
     {
     {
-        private object cachedItem = null;
+        private object cachedItem;
 
 
         public ObservableCollection<object> LayerTreeRoot
         public ObservableCollection<object> LayerTreeRoot
         {
         {
@@ -173,6 +173,18 @@ namespace PixiEditor.Views.UserControls
         private void TreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         private void TreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
         {
             SetInputOpacity(treeView.SelectedItem, numberInput);
             SetInputOpacity(treeView.SelectedItem, numberInput);
-        }
+        }
+
+        private void TreeView_PreviewMouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.ClickCount > 1)
+            {
+                if(sender is TreeView treeView && treeView.SelectedItem is LayerGroup group)
+                {
+                    group.StructureData.IsRenaming = true;
+                    e.Handled = true;
+                }
+            }
+        }
     }
     }
 }
 }