Dyn 5530 library zoom scaling (#13733)

filipeotero · web-flow · commit 295e3424edbd · 2023-02-16T05:19:53.000-08:00
* PreferencesView slider

* Slider style

* change zoom scale with the slider

* Saving zoom scale value in the preference settings

* removing wrong line

* removing extra instances

* fix unit tests

* adding 200% label

* removing extra spaces

* minor code changes

* minor changes

* Adding resource and adjust bar size related to the slider value

* retrigger checks
diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs
@@ -166,6 +166,11 @@ public bool IsADPAnalyticsReportingApproved
         /// </summary>
         public bool ShowConnectorToolTip { get; set; }
 
+        /// <summary>
+        /// Indicates the zoom scale of the library
+        /// </summary>
+        public float LibraryZoomScale { get; set; }
+
         /// <summary>
         /// The types of connector: Bezier or Polyline.
         /// </summary>
@@ -777,6 +782,8 @@ public PreferenceSettings()
             BackupFilesCount = 1;
             BackupFiles = new List<string>();
 
+            LibraryZoomScale = 1;
+
             CustomPackageFolders = new List<string>();
 
             PythonTemplateFilePath = "";
diff --git a/src/DynamoCoreWpf/Properties/AssemblyInfo.cs b/src/DynamoCoreWpf/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-﻿using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -46,6 +46,7 @@
 [assembly: InternalsVisibleTo("GraphMetadataViewExtension")]
 [assembly: InternalsVisibleTo("PackageDetailsViewExtension")]
 [assembly: InternalsVisibleTo("Notifications")]
+[assembly: InternalsVisibleTo("LibraryViewExtensionWebView2")]
 [assembly: InternalsVisibleTo("IronPythonTests")]
 [assembly: InternalsVisibleTo("DynamoPackagesWPF")]
 [assembly: InternalsVisibleTo("DynamoPlayerExtension")]
@@ -56,4 +57,4 @@
 [assembly: TypeForwardedTo(typeof(Dynamo.Wpf.Interfaces.LayoutElement))]
 [assembly: TypeForwardedTo(typeof(Dynamo.Wpf.Interfaces.LayoutElementType))]
 [assembly: TypeForwardedTo(typeof(Dynamo.Wpf.Interfaces.LayoutIncludeInfo))]
-[assembly: TypeForwardedTo(typeof(Dynamo.Wpf.Interfaces.ILibraryViewCustomization))]
+[assembly: TypeForwardedTo(typeof(Dynamo.Wpf.Interfaces.ILibraryViewCustomization))]
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3488,4 +3488,10 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="GroupContextMenuPreview" xml:space="preserve">
     <value>Preview Geometry</value>
   </data>
+  <data name="LibraryZoomScaleTooltipText" xml:space="preserve">
+    <value>Drag to adjust Library zoom scale between 10% and 300%. You can also adjust this in Library by pressing “Shift” and scrolling the mouse wheel.</value>
+  </data>
+  <data name="PreferencesViewZoomScalingSettings" xml:space="preserve">
+    <value>Zoom Scaling</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3475,4 +3475,10 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="GroupContextMenuPreview" xml:space="preserve">
     <value>Preview Geometry</value>
   </data>
+  <data name="LibraryZoomScaleTooltipText" xml:space="preserve">
+    <value>Drag to adjust Library zoom scale between 10% and 300%. You can also adjust this in Library by pressing “Shift” and scrolling the mouse wheel.</value>
+  </data>
+  <data name="PreferencesViewZoomScalingSettings" xml:space="preserve">
+    <value>Zoom Scaling</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -5487,4 +5487,75 @@
         </Style.Triggers>
     </Style>
 
+    <!-- Custom Slider -->
+    <Style x:Key="SliderRepeatButton" TargetType="RepeatButton">
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Border  BorderThickness="1" BorderBrush="#757575" Background="#757575" Height="3"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SliderRepeatButton1" TargetType="RepeatButton">
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Border SnapsToDevicePixels="True" Background="#eeeeee"  BorderThickness="1" BorderBrush="#eeeeee" Height="3"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SliderThumb" TargetType="Thumb">
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Thumb">
+                    <Border Width="6" Height="20" CornerRadius="1 1 1 1" Background="#eeeeee"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="Slider"  TargetType="Slider">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Track Grid.Row="1" x:Name="PART_Track"   >
+                <Track.DecreaseRepeatButton>
+                    <RepeatButton Style="{StaticResource SliderRepeatButton1}"  Command="Slider.DecreaseLarge" />
+                </Track.DecreaseRepeatButton>
+                <Track.Thumb>
+                    <Thumb Style="{StaticResource SliderThumb}"  />
+                </Track.Thumb>
+                <Track.IncreaseRepeatButton>
+                    <RepeatButton Style="{StaticResource SliderRepeatButton}" Command="Slider.IncreaseLarge" />
+                </Track.IncreaseRepeatButton>
+            </Track>
+        </Grid>
+    </ControlTemplate>
+
+    <Style x:Key="SliderStyle" TargetType="Slider">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Template" Value="{StaticResource Slider}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -75,6 +75,7 @@ public partial class DynamoView : Window, IDisposable
         private int tabSlidingWindowStart, tabSlidingWindowEnd;
         private readonly LoginService loginService;
         private ShortcutToolbar shortcutBar;
+        private PreferencesView preferencesWindow;
         private bool loaded = false;
         // This is to identify whether the PerformShutdownSequenceOnViewModel() method has been
         // called on the view model and the process is not cancelled
@@ -98,6 +99,12 @@ public partial class DynamoView : Window, IDisposable
 
         internal ShortcutToolbar ShortcutBar { get { return shortcutBar; } }
 
+        internal PreferencesView PreferencesWindow {
+            get { return preferencesWindow; }
+        }
+
+        internal event Action OnPreferencesWindowChanged;
+
         /// <summary>
         /// Constructor
         /// </summary>
@@ -1868,7 +1875,8 @@ private void OnDebugModesClick(object sender, RoutedEventArgs e)
 
         private void OnPreferencesWindowClick(object sender, RoutedEventArgs e)
         {
-            var preferencesWindow = new PreferencesView(this);
+            preferencesWindow = new PreferencesView(this);
+            OnPreferencesWindowChanged();
             preferencesWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             preferencesWindow.ShowDialog();
         }
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -919,6 +919,7 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <!--Group Styles Expander-->
                             <Expander x:Name="Styles"
@@ -1258,6 +1259,68 @@
                                     </StackPanel>
                                 </Grid>
                             </Expander>
+
+                            <!--Render Zoom Scaling Expander-->
+                            <Expander x:Name="ZoomScaling"
+                                      Grid.Row="3"
+                                      Style="{StaticResource MenuExpanderStyle}" 
+                                      IsExpanded="{Binding PreferencesTabs[VisualSettings].ExpanderActive, Converter={StaticResource ExpandersBindingConverter}, ConverterParameter=ZoomScaling}"
+                                      Header="{x:Static p:Resources.PreferencesViewZoomScalingSettings}">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <StackPanel Margin="0,10,0,5" Grid.Row="0" Orientation="Horizontal">
+                                        <TextBlock  FontSize="12" Text="Library"></TextBlock>
+                                        <Label HorizontalAlignment="Left"
+                                                   Name="LibraryZoomScaleInfoLabel"
+                                                   VerticalAlignment="Center" 
+                                                   Height="26" 
+                                                   Width="53">
+                                            <Image
+                                               Width="14"
+                                               Height="14"
+                                               Margin="0,0,0,5"
+                                               Grid.Column="1"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.LibraryZoomScaleTooltipText}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>
+                                        </Label>
+                                    </StackPanel>
+                                   
+                                    <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,0,0,3">
+                                        
+                                        <Slider
+                                            x:Name="LibraryZoomScalingSlider"
+                                            Style="{StaticResource SliderStyle}"
+                                            Width="440"
+                                            Minimum="0.1"
+                                            Maximum="3">
+                                        </Slider>
+                                    </StackPanel>
+                                    <StackPanel Grid.Row="2" Width="550">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="125"></ColumnDefinition>
+                                                <ColumnDefinition Width="150"></ColumnDefinition>
+                                                <ColumnDefinition Width="135"></ColumnDefinition>
+                                                <ColumnDefinition Width="*"></ColumnDefinition>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock Text="10%" Grid.Column="0"></TextBlock>
+                                            <TextBlock Text="100%" Grid.Column="1"></TextBlock>
+                                            <TextBlock Text="200%" Grid.Column="2"></TextBlock>
+                                            <TextBlock Text="300%" Grid.Column="3"></TextBlock>
+                                        </Grid>
+                                    </StackPanel>
+                                </Grid>
+                            </Expander>
                         </Grid>
                     </TabItem>
 
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
@@ -15,6 +15,7 @@
 using Dynamo.Exceptions;
 using Dynamo.Logging;
 using Dynamo.UI;
+using Dynamo.UI.Views;
 using Dynamo.ViewModels;
 using Res = Dynamo.Wpf.Properties.Resources;
 
@@ -54,12 +55,12 @@ private void StoreOriginalCustomGroupStyles()
         /// </summary>
         /// <param name="dynamoViewModel"> Dynamo ViewModel</param>
         public PreferencesView(DynamoView dynamoView)
-        {            
+        {
             dynViewModel = dynamoView.DataContext as DynamoViewModel;            
             SetupPreferencesViewModel(dynViewModel);
 
             DataContext = dynViewModel.PreferencesViewModel;
- 
+
             InitializeComponent();
             Dynamo.Logging.Analytics.TrackEvent(
                 Actions.Open,
@@ -81,6 +82,8 @@ public PreferencesView(DynamoView dynamoView)
             viewModel.InitializeGeometryScaling();
 
             viewModel.RequestShowFileDialog += OnRequestShowFileDialog;
+
+            LibraryZoomScalingSlider.Value = dynViewModel.Model.PreferenceSettings.LibraryZoomScale;
         }
 
         /// <summary>
diff --git a/src/LibraryViewExtensionWebView2/LibraryViewController.cs b/src/LibraryViewExtensionWebView2/LibraryViewController.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using Dynamo.Controls;
 using Dynamo.Extensions;
 using Dynamo.LibraryViewExtensionWebView2.Handlers;
 using Dynamo.LibraryViewExtensionWebView2.ViewModels;
@@ -31,6 +32,7 @@ namespace Dynamo.LibraryViewExtensionWebView2
     public class LibraryViewController : IDisposable
     {
         private Window dynamoWindow;
+        private DynamoView dynamoView;
         private ICommandExecutive commandExecutive;
         private DynamoViewModel dynamoViewModel;
         private FloatingLibraryTooltipPopup libraryViewTooltip;
@@ -72,6 +74,9 @@ internal LibraryViewController(Window dynamoView, ICommandExecutive commandExecu
             dynamoWindow.StateChanged += DynamoWindowStateChanged;
             dynamoWindow.SizeChanged += DynamoWindow_SizeChanged;
 
+            this.dynamoView = dynamoView as DynamoView;
+            this.dynamoView.OnPreferencesWindowChanged += PreferencesWindowChanged;
+
             DirectoryInfo webBrowserUserDataFolder;
             var userDataDir = new DirectoryInfo(dynamoViewModel.Model.PathManager.UserDataDirectory);
             webBrowserUserDataFolder = userDataDir.Exists ? userDataDir : null;
@@ -81,6 +86,16 @@ internal LibraryViewController(Window dynamoView, ICommandExecutive commandExecu
             }
         }
 
+        private void Browser_ZoomFactorChanged(object sender, EventArgs e)
+        {
+            dynamoViewModel.Model.PreferenceSettings.LibraryZoomScale = ((float)browser.ZoomFactor);
+        }
+
+        void PreferencesWindowChanged()
+        {
+            this.dynamoView.PreferencesWindow.LibraryZoomScalingSlider.ValueChanged += DynamoSliderValueChanged;
+        }
+
         //if the window is resized toggle visibility of browser to force redraw
         private void DynamoWindow_SizeChanged(object sender, SizeChangedEventArgs e)
         {
@@ -321,6 +336,9 @@ private void Browser_CoreWebView2InitializationCompleted(object sender, CoreWebV
             }
 
             SetLibraryFontSize();
+            
+            browser.ZoomFactor = dynamoViewModel.Model.PreferenceSettings.LibraryZoomScale;
+            browser.ZoomFactorChanged += Browser_ZoomFactorChanged;
         }
 
         private void Browser_Loaded(object sender, RoutedEventArgs e)
@@ -528,6 +546,13 @@ private void InitializeResourceProviders(DynamoModel model, LibraryViewCustomiza
             layoutProvider = new LayoutSpecProvider(customization, iconProvider, "Dynamo.LibraryViewExtensionWebView2.web.library.layoutSpecs.json");
         }
 
+        private void DynamoSliderValueChanged(object sender, EventArgs e)
+        {
+            Slider slider = (Slider)sender;
+            browser.ZoomFactor = slider.Value;
+            dynamoViewModel.Model.PreferenceSettings.LibraryZoomScale = ((float)slider.Value);
+        }
+
         /// <summary>
         /// This method will execute the action of moving the Guide to the next Step (it is triggered when a specific html div that contains the package is clicked).
         /// </summary>
@@ -567,6 +592,10 @@ protected void Dispose(bool disposing)
             {
                 dynamoWindow.StateChanged -= DynamoWindowStateChanged;
                 dynamoWindow.SizeChanged -= DynamoWindow_SizeChanged;
+                browser.ZoomFactorChanged -= Browser_ZoomFactorChanged;
+                this.dynamoView.PreferencesWindow.LibraryZoomScalingSlider.ValueChanged -= DynamoSliderValueChanged;
+                this.dynamoView.OnPreferencesWindowChanged -= PreferencesWindowChanged;
+
                 dynamoWindow = null;
             }
             if (this.browser != null)
diff --git a/test/DynamoCoreWpfTests/PackageManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/PackageManagerViewExtensionTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
diff --git a/test/settings/DynamoSettings-NewSettings.xml b/test/settings/DynamoSettings-NewSettings.xml
