From d57eb39ad110a13b70b9612b5b28b83be8f448f5 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Mon, 30 Oct 2023 00:24:52 +0000
Subject: [PATCH] fixed custombrowsercontrol visuals

- multiple ui fixes to the custom browser control
---
 .../Controls/CustomBrowserControl.xaml        | 169 ++++++------------
 .../Controls/CustomBrowserControl.xaml.cs     | 106 +++++++----
 .../Pages/PublishPackagePublishPage.xaml      |   1 +
 3 files changed, 120 insertions(+), 156 deletions(-)

diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml
index 6a4e1dd5ee8..231b45fb215 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml
@@ -23,6 +23,7 @@
             <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#DCDCDC"/>
             <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="Transparent"/>
             <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF82DFFB"/>
+            <SolidColorBrush x:Key="StrokeBrush" Color="#696969" />
 
             <PathGeometry x:Key="TreeArrow" Figures="M 0 0 L 0 7.2 L 4.8 3.6 Z"/>
         
@@ -70,99 +71,6 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-
-            <Style x:Key="InnerFolderToggleStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Focusable" Value="False"/>
-                <Setter Property="Width" Value="16"/>
-                <Setter Property="Height" Value="16"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Background="Transparent" Height="16" Padding="0" Width="16" Margin="-21 0 0 0">
-                                <Canvas Height="16" Width="16">
-                                    <Path x:Name="IndentHorizontal" Data="M0,8 L16,8 Z" Stroke="#DCDCDC" StrokeDashArray="1 3"/>
-                                    <Path x:Name="ExpandPath" Data="{StaticResource TreeArrow}" Fill="{StaticResource TreeViewItem.TreeArrow.Static.Fill}" Stroke="{StaticResource TreeViewItem.TreeArrow.Static.Stroke}"
-                                          Margin="18 5 0 0">
-                                        <Path.RenderTransform>
-                                            <RotateTransform Angle="0" CenterY="3" CenterX="3"/>
-                                        </Path.RenderTransform>
-                                    </Path>
-                                </Canvas>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsChecked" Value="True">
-                                    <Setter Property="RenderTransform" TargetName="ExpandPath">
-                                        <Setter.Value>
-                                            <RotateTransform Angle="90" CenterY="3" CenterX="1.5"/>
-                                        </Setter.Value>
-                                    </Setter>
-                                    <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.Static.Checked.Fill}"/>
-                                    <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.Static.Checked.Stroke}"/>
-                                </Trigger>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Fill}"/>
-                                </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsMouseOver" Value="True"/>
-                                        <Condition Property="IsChecked" Value="True"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Stroke}"/>
-                                    <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Fill}"/>
-                                </MultiTrigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
-            <!--File toggle-->
-            <Style x:Key="FileToggleStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Focusable" Value="False"/>
-                <Setter Property="Width" Value="16"/>
-                <Setter Property="Height" Value="16"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Background="Transparent" Height="16" Padding="0" Width="16">
-                                <Canvas>
-                                    <Path x:Name="IndentHorizontal" Data="M0,8 L16,8 Z" Stroke="#DCDCDC" StrokeDashArray="1 3"/>
-                                    <!--<Path x:Name="IndentVertical" Data="M0,0 L0,16 Z" Stroke="#DCDCDC" StrokeDashArray="1 3"/>-->
-                                </Canvas>
-                            </Border>
-
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="LastFileToggleStyle" TargetType="{x:Type ToggleButton}">
-                <Setter Property="Focusable" Value="False"/>
-                <Setter Property="Width" Value="16"/>
-                <Setter Property="Height" Value="16"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                            <Border Background="Transparent" Height="16" Padding="0" Width="16">
-                                <Canvas>
-                                    <Path x:Name="IndentHorizontal" Data="M0,8 L16,8 Z" Stroke="#DCDCDC" StrokeDashArray="1 3"/>
-                                    <!--<Path x:Name="IndentVertical" Data="M0,0 L0,8 Z" Stroke="#DCDCDC" StrokeDashArray="1 3"/>-->
-                                </Canvas>
-                            </Border>
-
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="TreeViewItemFocusVisual">
-                <Setter Property="Control.Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Rectangle/>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>            
         
            <!--Tree view style-->
             <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
@@ -316,38 +224,69 @@
             <local:HasChildrenToVisibilityConverter x:Key="HasChildrenToVisibilityConverter" />
             <local:DependencyTypeToVisibilityConverter x:Key="DependencyTypeToVisibilityConverter" />
             <local:SortingConverter x:Key="SortingConverter" />
+            <local:ChildrenItemsContainsFolderToVisibilityConverter x:Key="ChildrenItemsContainsFolderToVisibilityConverter" />
 
             <ControlTemplate x:Key="TreeViewItemControlTemplate1" TargetType="{x:Type TreeViewItem}">
                 <Grid x:Name="tvGrid">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition MinWidth="19" Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition MinWidth="19" Width="Auto"/>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="20"/>
+                        <ColumnDefinition Width="24"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="24"/>
+                        <RowDefinition Height="30"/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                 
                     <!-- Selection border -->
                     <Border Grid.ColumnSpan="5" Grid.Column="0" x:Name="SelectionBorder" Background="Transparent" Opacity="0.1"/>
 
-                    <Border Grid.Column="0" 
+                    <!-- Vertical dash line and sets the indent -->
+                    <Border Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Stretch"
                             Width="{Binding Path=(local:TreeViewItemHelper.Indent).Value, Mode=OneWay, RelativeSource={RelativeSource AncestorType=ItemsPresenter}}">
-                        <Grid>
-                            <!--<Rectangle Width="1" Height="24" Stroke="#DCDCDC" StrokeDashArray="3 3" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10 0 0 0"
-                                       x:Name="LongMarker" />-->
-                            <Rectangle Width="1" Height="24" Stroke="#696969" StrokeDashArray="3 3" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 0 5 0"
-                                       x:Name="VerticalMarker"/>
-                        </Grid>
+                        <Rectangle Width="1" Height="Auto" Stroke="{StaticResource StrokeBrush}"
+                                   HorizontalAlignment="Right"
+                                   VerticalAlignment="Stretch"
+                                   StrokeDashArray="1,2.3"
+                                   StrokeThickness="3"
+                                   UseLayoutRounding="True"
+                                   SnapsToDevicePixels="True"
+                                   Margin="0 -8 0 14"
+                                   x:Name="VerticalMarker">
+                        </Rectangle>
                     </Border>
+                    
+                    <!-- Horizontal dash line -->
+                    <Border Grid.Column="1">
+                        <Rectangle Width="18" Height="1"                                        
+                                   StrokeDashArray="1,3,1,2"
+                                   StrokeThickness="3" Stroke="{StaticResource StrokeBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" 
+                                   Margin="-1 3 0 0"
+                                   Visibility="Visible"
+                                   x:Name="HorizontalMarker"/>
+                    </Border>
+                    
+                    <!-- Arrow expander -->
+                    <ToggleButton x:Name="Expander"
+                                  Grid.Column="2"
+                                  Margin="-15 0 0 0"
+                                  ClickMode="Press"
+                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                  Style="{StaticResource FolderToggleStyle}"
+                                  Visibility="{Binding ChildItems,
+                                                       Converter={StaticResource ChildrenItemsContainsFolderToVisibilityConverter}}" />
+                    <!-- Content presenter -->
+                    <Border x:Name="Bd" 
+                            Grid.Column="3"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="True">
 
-                    <ToggleButton x:Name="Expander" Grid.Column="1" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource FolderToggleStyle}"/>
-
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="2" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                        <Grid>                        
+                        <Grid>
                             <ContentPresenter x:Name="PART_Header"
                                               ContentTemplate="{TemplateBinding HeaderTemplate}" 
                                               Content="{TemplateBinding Header}" 
@@ -357,14 +296,11 @@
                                               VerticalAlignment="Center"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
 
-                            <Rectangle Width="10" Height="1" Stroke="#696969" StrokeDashArray="2 2" HorizontalAlignment="Left" VerticalAlignment="Center" 
-                                       Margin="-26 0 -5 0"
-                                       x:Name="HorizontalMarker"/>  
                         </Grid>
                     </Border>
                 
-                    <!-- Right buttons -->
-                    <Grid Grid.Column="4" HorizontalAlignment="Right">
+                    <!-- Garbage icon remove item button -->
+                    <Grid Grid.Column="4" HorizontalAlignment="Right" Margin="0 0 8 0">
                         <Button Margin="2"
                                 x:Name="RemoveButton"
                                 BorderThickness="0"
@@ -389,6 +325,7 @@
                                 </ControlTemplate>
                             </Button.Template>
                         </Button>
+                        
                     </Grid>
 
                     <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="5" Grid.Column="0" Grid.Row="1"
@@ -398,12 +335,6 @@
                     <Trigger Property="IsExpanded" Value="False">
                         <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
                     </Trigger>  
-                    <!--<Trigger Property="HasItems" Value="False">
-                        <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                    </Trigger>-->
-                    <Trigger Property="HasItems" Value="True">  
-                        <Setter Property="Height" TargetName="VerticalMarker" Value="12"/>
-                    </Trigger>
                     <Trigger Property="IsSelected" Value="True">
                         <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
                         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
@@ -463,7 +394,7 @@
                                SnapsToDevicePixels="True"
                                UseLayoutRounding="True"
                                TextTrimming="CharacterEllipsis"
-                               Width="230"
+                               Width="180"
                                FontFamily="{StaticResource ArtifaktElementRegular}"/>
                 </HierarchicalDataTemplate>
             </TreeView.ItemTemplate>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs
index 94199c2342e..3612b2c2ed0 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs
@@ -1,5 +1,3 @@
-using Dynamo.Utilities;
-using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -12,6 +10,8 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
+using Dynamo.Utilities;
+using Lucene.Net.Util;
 
 namespace Dynamo.PackageManager.UI
 {
@@ -20,8 +20,6 @@ namespace Dynamo.PackageManager.UI
     /// </summary>
     public partial class CustomBrowserControl : UserControl
     {
-        private PublishPackageViewModel PublishPackageViewModel;
-
         /// <summary>
         /// Binds the ItemsSource of the TreeView
         /// </summary>
@@ -77,42 +75,52 @@ private void UpdateCustomTreeView(object sender)
             var visualChildren = FindVisualChildren<TreeViewItem>(treeView);
             if (visualChildren == null || visualChildren.Count() == 0) return;
 
-            ApplyLastTreeItem(visualChildren);
+            var root = visualChildren.First();
+
+            var hmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(root, "HorizontalMarker");
+            if (hmarker != null) hmarker.Visibility = Visibility.Hidden;
+            
+            root.IsSelected = true;
+
+
+            //ApplyLastTreeItem(visualChildren);
 
             // setting the visual styles for each separate 'root' folder
-            foreach(var item in visualChildren)
-            {
-                var rootItem = item.Header as PackageItemRootViewModel;
-                if (rootItem.isChild) continue;
+            //foreach (var item in visualChildren)
+            //{
+            //    var rootItem = item.Header as PackageItemRootViewModel;
+            //    if (rootItem.isChild) continue;
 
-                item.ApplyTemplate();
-                item.IsExpanded = true;
-                item.UpdateLayout();    
-
-                var hmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(item, "HorizontalMarker");
-                if (hmarker != null) hmarker.Visibility = Visibility.Hidden;
-                var vmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(item, "VerticalMarker");
-                if (vmarker != null) vmarker.Visibility = Visibility.Hidden;
-
-                //var children = FindVisualChildren<TreeViewItem>(item);
-                //if(children != null)
-                //{
-                //    try
-                //    {   
-                //        var lastItem = children.Last();
-
-                //        lastItem.IsExpanded = true;
-                //        lastItem.UpdateLayout();
-                //        lastItem.ApplyTemplate();
-
-                //        var lmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(lastItem, "LongMarker");
-                //        if (lmarker != null) lmarker.Visibility = Visibility.Hidden;
-                //    }
-                //    catch (Exception) { }
-                //}
-            }
+            //    item.ApplyTemplate();
+            //    item.IsExpanded = true;
+            //    item.UpdateLayout();    
+
+
+            //    var hmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(item, "HorizontalMarker");
+            //    if (hmarker != null) hmarker.Visibility = Visibility.Hidden;
+            //    var vmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(item, "VerticalMarker");
+            //    if (vmarker != null) vmarker.Visibility = Visibility.Hidden;
+
+
+            //    //var children = FindVisualChildren<TreeViewItem>(item);
+            //    //if(children != null)
+            //    //{
+            //    //    try
+            //    //    {   
+            //    //        var lastItem = children.Last();
+
+            //    //        lastItem.IsExpanded = true;
+            //    //        lastItem.UpdateLayout();
+            //    //        lastItem.ApplyTemplate();
+
+            //    //        var lmarker = FindVisualChild<System.Windows.Shapes.Rectangle>(lastItem, "LongMarker");
+            //    //        if (lmarker != null) lmarker.Visibility = Visibility.Hidden;
+            //    //    }
+            //    //    catch (Exception) { }
+            //    //}
+            //}
 
-            visualChildren.First().IsSelected = true;
+            //visualChildren.First().IsSelected = true;
         }
 
         //private static TreeViewItem FindTreeViewSelectedItemContainer(ItemsControl root, object selection)
@@ -157,8 +165,10 @@ private static void ApplyLastTreeItem(IEnumerable<TreeViewItem> treeViewItems)
                         lastItem.UpdateLayout();
                         lastItem.ApplyTemplate();
 
+                        
                         var marker = FindVisualChild<System.Windows.Shapes.Rectangle>(item, "VerticalMarker");
                         if (marker != null) marker.Height = 12;
+                        
                     }
                 }
             }
@@ -319,7 +329,7 @@ public static void SetIndent(DependencyObject obj, GridLength value)
 
     public class IndentConverter : IValueConverter
     {
-        private const int IndentSize = 16;  // hard-coded into the XAML template
+        private const int IndentSize = 20;  // hard-coded into the XAML template
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -382,6 +392,28 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    public class ChildrenItemsContainsFolderToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is ICollection<PackageItemRootViewModel> children)
+            {
+                bool containsFolders = children.Any(x => x.DependencyType.Equals(DependencyType.Folder));
+
+                // Return visible if there are any folders in this root item's children
+                return containsFolders ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            // Default style or value if the input is not a TreeViewItem
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     public class SortingConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
index 7e9ebf27889..8fb5443cca5 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
@@ -667,6 +667,7 @@
                             <local:CustomBrowserControl x:Name="previewBrowserControl"
                                                         Loaded="previewBrowserControl_Loaded"
                                                         IsEnabled="False"
+                                                        Margin="0 5"
                                                         Root="{Binding PreviewPackageContents, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
                                                         Visibility="{Binding PreviewPackageContents,
                                                                              UpdateSourceTrigger=PropertyChanged,