Skip to content

Commit

Permalink
Merge pull request #286 from YJammak/main
Browse files Browse the repository at this point in the history 
SukiWindow adds TitleBarAnimationEnabled
  • Loading branch information
@sirdoombox
sirdoombox authored Aug 31, 2024
2 parents ac659f4 + b02a0eb commit fa3b891
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 32 deletions.
82 changes: 50 additions & 32 deletions SukiUI/Controls/SukiWindow.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
<ItemsControl ItemsSource="{Binding Hosts, RelativeSource={RelativeSource AncestorType={x:Type suki:SukiWindow}}}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<Panel/>
<Panel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
</VisualLayerManager.ChromeOverlayLayer>
<Panel x:Name="PART_Root">
<!-- Margin -100 is there to exclude the unwanted bright corners -->
<suki:SukiBackground Name="PART_Background" Margin="-150"
<!-- Margin -100 is there to exclude the unwanted bright corners -->
<suki:SukiBackground Name="PART_Background"
Margin="-150"
AnimationEnabled="{TemplateBinding BackgroundAnimationEnabled}"
ShaderCode="{TemplateBinding BackgroundShaderCode}"
ShaderFile="{TemplateBinding BackgroundShaderFile}"
Expand Down Expand Up @@ -133,36 +134,53 @@
<Style Selector="^[WindowState=Normal] /template/ PathIcon#MaximizeIcon">
<Setter Property="Data" Value="{x:Static icons:Icons.WindowMaximize}" />
</Style>

<Style Selector="^[IsTitleBarVisible=True] /template/ LayoutTransformControl#PART_LayoutTransform">
<Style.Animations>
<Animation Easing="{StaticResource MenuEasing}"
FillMode="Forward"
Duration="{StaticResource MediumAnimationDuration}">
<KeyFrame Cue="0%">
<Setter Property="ScaleTransform.ScaleY" Value="0" />
<Setter Property="IsVisible" Value="True" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="ScaleTransform.ScaleY" Value="1" />
</KeyFrame>
</Animation>
</Style.Animations>
<Style Selector="^[IsTitleBarVisible=True]">
<Style Selector="^[TitleBarAnimationEnabled=True]">
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransform">
<Style.Animations>
<Animation Easing="{StaticResource MenuEasing}"
FillMode="Forward"
Duration="{StaticResource MediumAnimationDuration}">
<KeyFrame Cue="0%">
<Setter Property="ScaleTransform.ScaleY" Value="0" />
<Setter Property="IsVisible" Value="True" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="ScaleTransform.ScaleY" Value="1" />
</KeyFrame>
</Animation>
</Style.Animations>
</Style>
</Style>
<Style Selector="^[TitleBarAnimationEnabled=False]">
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransform">
<Setter Property="IsVisible" Value="True" />
</Style>
</Style>
</Style>
<Style Selector="^[IsTitleBarVisible=False] /template/ LayoutTransformControl#PART_LayoutTransform">
<Style.Animations>
<Animation Easing="{StaticResource MenuEasing}"
FillMode="Forward"
Duration="{StaticResource MediumAnimationDuration}">
<KeyFrame Cue="0%">
<Setter Property="ScaleTransform.ScaleY" Value="1" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="ScaleTransform.ScaleY" Value="0" />
<Setter Property="IsVisible" Value="False" />
</KeyFrame>
</Animation>
</Style.Animations>
<Style Selector="^[IsTitleBarVisible=False]">
<Style Selector="^[TitleBarAnimationEnabled=True]">
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransform">
<Style.Animations>
<Animation Easing="{StaticResource MenuEasing}"
FillMode="Forward"
Duration="{StaticResource MediumAnimationDuration}">
<KeyFrame Cue="0%">
<Setter Property="ScaleTransform.ScaleY" Value="1" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="ScaleTransform.ScaleY" Value="0" />
<Setter Property="IsVisible" Value="False" />
</KeyFrame>
</Animation>
</Style.Animations>
</Style>
</Style>
<Style Selector="^[TitleBarAnimationEnabled=False]">
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransform">
<Setter Property="IsVisible" Value="False" />
</Style>
</Style>
</Style>
</ControlTheme>
<ControlTheme x:Key="{x:Type suki:SukiWindow}"
Expand Down
9 changes: 9 additions & 0 deletions SukiUI/Controls/SukiWindow.axaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ public bool IsTitleBarVisible
set => SetValue(IsTitleBarVisibleProperty, value);
}

public static readonly StyledProperty<bool> TitleBarAnimationEnabledProperty =
AvaloniaProperty.Register<SukiWindow, bool>(nameof(TitleBarAnimationEnabled), defaultValue: true);

public bool TitleBarAnimationEnabled
{
get => GetValue(TitleBarAnimationEnabledProperty);
set => SetValue(TitleBarAnimationEnabledProperty, value);
}

public static readonly StyledProperty<bool> IsMenuVisibleProperty =
AvaloniaProperty.Register<SukiWindow, bool>(nameof(IsMenuVisible), defaultValue: false);

Expand Down

0 comments on commit fa3b891

Please sign in to comment.