IsAnimated property for glasscard, disabled on menu and window to foc…

…us on content
kikipoulet · May 31, 2024 · 1b9f8fb · 1b9f8fb
1 parent 35e9f09
commit 1b9f8fb
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 24 deletions.
diff --git a/SukiUI/Controls/GlassMorphism/GlassCard.axaml.cs b/SukiUI/Controls/GlassMorphism/GlassCard.axaml.cs
@@ -33,6 +33,15 @@ public class GlassCard : ContentControl
         set => SetValue(BorderThicknessProperty, value);
     }
 
+    public static readonly StyledProperty<bool> IsAnimatedProperty =
+        AvaloniaProperty.Register<GlassCard, bool>(nameof(IsAnimated), true);
+
+    public bool IsAnimated
+    {
+        get => GetValue(IsAnimatedProperty);
+        set => SetValue(IsAnimatedProperty, value);
+    }
+
     public static readonly StyledProperty<bool> IsOpaqueProperty =
         AvaloniaProperty.Register<GlassCard, bool>(nameof(IsOpaque), false);
 
@@ -76,28 +85,31 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-       var b =  e.NameScope.Get<Panel>("RootPanel");
-       b.Loaded += (sender, args) =>
-       {
-           var v = ElementComposition.GetElementVisual(b);
-           MakeOpacityAnimated(v);
-       };
-
-       var b2 =  e.NameScope.Get<Border>("PART_BorderCard");
-       b2.Loaded += (sender, args) =>
-       {
-           var v = ElementComposition.GetElementVisual(b2);
-           MakeSizeAnimated(v);
-       };
-
-       var b3 =  e.NameScope.Get<Border>("PART_ClipBorder");
-       b3.Loaded += (sender, args) =>
-       {
-           var v = ElementComposition.GetElementVisual(b3);
-           MakeSizeAnimated(v);
-       };
-
 
+        if (IsAnimated)
+        {
+            var b = e.NameScope.Get<Panel>("RootPanel");
+            b.Loaded += (sender, args) =>
+            {
+                var v = ElementComposition.GetElementVisual(b);
+                MakeOpacityAnimated(v);
+            };
+
+            var b2 = e.NameScope.Get<Border>("PART_BorderCard");
+            b2.Loaded += (sender, args) =>
+            {
+                var v = ElementComposition.GetElementVisual(b2);
+                MakeSizeAnimated(v);
+            };
+
+            var b3 = e.NameScope.Get<Border>("PART_ClipBorder");
+            b3.Loaded += (sender, args) =>
+            {
+                var v = ElementComposition.GetElementVisual(b3);
+                MakeSizeAnimated(v);
+            };
+
+        }
 
     }
 

diff --git a/SukiUI/Controls/SukiSideMenu.axaml b/SukiUI/Controls/SukiSideMenu.axaml
@@ -13,7 +13,7 @@
                     <SplitView.Pane>
                         <Border>
                             <Grid Background="Transparent">
-                                <suki:GlassCard Name="Glass"
+                                <suki:GlassCard Name="Glass" IsAnimated="False"
                                                 BorderThickness="0"
                                                 CornerRadius="0" />
                                 <DockPanel>

diff --git a/SukiUI/Controls/SukiWindow.axaml b/SukiUI/Controls/SukiWindow.axaml
@@ -30,7 +30,7 @@
                                             <StackPanel>
                                                 <LayoutTransformControl Name="PART_LayoutTransform" RenderTransformOrigin="0%,0%">
                                                     <Panel>
-                                                        <suki:GlassCard Name="PART_TitleBarBackground"
+                                                        <suki:GlassCard Name="PART_TitleBarBackground" IsAnimated="False"
                                                                         BorderThickness="0"
                                                                         CornerRadius="0" />
                                                         <DockPanel Margin="12,9" LastChildFill="True">

diff --git a/SukiUI/Theme/Menu.axaml b/SukiUI/Theme/Menu.axaml
@@ -89,7 +89,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl Name="PART_LayoutTransform" RenderTransformOrigin="50%, 0%">
-                    <controls:GlassCard Height="45"
+                    <controls:GlassCard Height="45" IsAnimated="False"
                                         Padding="{TemplateBinding Padding}"
                                         BorderBrush="{DynamicResource SukiBorderBrush}"
                                         BorderThickness="0"