Merge branch 'master' into devsecops

aleks-ivanov · Nov 20, 2023 · c109d84 · c109d84
2 parents 587d284 + a0a3cd4
commit c109d84
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/ModernWpf.Controls/NavigationView/NavigationView.xaml b/ModernWpf.Controls/NavigationView/NavigationView.xaml
@@ -206,13 +206,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="IconBox" Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="IconColumn" Storyboard.TargetProperty="Width">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <GridLength>16</GridLength>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="IconColumn" Storyboard.TargetProperty="Width">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="16" />
+                                        </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>

diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItem.cs b/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
@@ -240,7 +240,11 @@ void UpdateNavigationViewItemToolTip()
             {
                 if (ShouldEnableToolTip())
                 {
-                    ToolTipService.SetToolTip(this, m_suggestedToolTipContent);
+                    // Don't SetToolTip with the same parameter because it close/re-open the ToolTip
+                    if (toolTipContent != m_suggestedToolTipContent)
+                    {
+                        ToolTipService.SetToolTip(this, m_suggestedToolTipContent);
+                    }
                 }
                 else
                 {

diff --git a/ModernWpf/ControlsResources.xaml b/ModernWpf/ControlsResources.xaml
@@ -65,9 +65,9 @@
     <Thickness x:Key="NumberBoxIconMargin">10,0,0,0</Thickness>
     <Thickness x:Key="RadioButtonsTopHeaderMargin">0,0,0,4</Thickness>
     <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,0</Thickness>
-    <sys:Double x:Key="ToggleSwitchPreContentMargin">6</sys:Double>
-    <sys:Double x:Key="ToggleSwitchPostContentMargin">6</sys:Double>
+    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,4</Thickness>
+    <sys:Double x:Key="ToggleSwitchPreContentMargin">10</sys:Double>
+    <sys:Double x:Key="ToggleSwitchPostContentMargin">10</sys:Double>
     <sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>
 
     <sys:Double x:Key="MenuFlyoutSeparatorHeight">1</sys:Double>

diff --git a/test/ModernWpfTestApp/CommonStylesPage.xaml.cs b/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
@@ -124,9 +124,9 @@ private void ToggleSwitchDensityTest_Click(object sender, RoutedEventArgs e)
             var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
             simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");
 
-            string expectedHeaderMargin = "0,0,0,0";
-            string expectToggleSwitchPreContentMargin = "6";
-            string expectToggleSwitchPostContentMargin = "6";
+            string expectedHeaderMargin = "0,0,0,4";
+            string expectToggleSwitchPreContentMargin = "10";
+            string expectToggleSwitchPostContentMargin = "10";
 
             if (contentPresenter != null)
             {