chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: make titlebar visible property actually useful.

Browse Source
This commit is contained in:
rabbitism
2024-08-14 18:23:56 +08:00
parent b04f83f340
commit 74994e77f7
4 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Ursa.Themes.Semi/Controls/UrsaView.axaml
View File

@@ -1,7 +1,8 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="https://github.com/avaloniaui"
xmlns:u="https://irihi.tech/ursa"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<!-- Add Resources Here --> xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:UrsaView}" TargetType="{x:Type u:UrsaView}"> <ControlTheme x:Key="{x:Type u:UrsaView}" TargetType="{x:Type u:UrsaView}">
<Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
<Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" /> <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
@@ -20,12 +21,25 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" /> ContentTemplate="{TemplateBinding ContentTemplate}" />
<Grid ColumnDefinitions="Auto, *, Auto" <Grid
Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"
VerticalAlignment="Top" VerticalAlignment="Top"
Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"> ColumnDefinitions="Auto, *, Auto">
<ContentPresenter Grid.Column="0" Content="{TemplateBinding LeftContent}" VerticalAlignment="Center"/> <ContentPresenter
<ContentPresenter Grid.Column="1" Content="{TemplateBinding TitleBarContent}" VerticalAlignment="Center"/> Grid.Column="0"
<ContentPresenter Grid.Column="2" Content="{TemplateBinding RightContent}" VerticalAlignment="Center"/> VerticalAlignment="Center"
IsVisible="{TemplateBinding IsTitleBarVisible}"
Content="{TemplateBinding LeftContent}" />
<ContentPresenter
Grid.Column="1"
VerticalAlignment="Center"
IsVisible="{TemplateBinding IsTitleBarVisible}"
Content="{TemplateBinding TitleBarContent}" />
<ContentPresenter
Grid.Column="2"
VerticalAlignment="Center"
IsVisible="{TemplateBinding IsTitleBarVisible}"
Content="{TemplateBinding RightContent}" />
</Grid> </Grid>
<u:OverlayDialogHost IsModalStatusReporter="True" /> <u:OverlayDialogHost IsModalStatusReporter="True" />
</Panel> </Panel>

4
src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
View File

@@ -60,6 +60,7 @@
<VisualLayerManager Padding="{TemplateBinding OffScreenMargin, Mode=OneWay}"> <VisualLayerManager Padding="{TemplateBinding OffScreenMargin, Mode=OneWay}">
<VisualLayerManager.ChromeOverlayLayer> <VisualLayerManager.ChromeOverlayLayer>
<u:TitleBar <u:TitleBar
IsTitleVisible="{TemplateBinding IsTitleBarVisible}"
Content="{Binding $parent[u:UrsaWindow].TitleBarContent}" Content="{Binding $parent[u:UrsaWindow].TitleBarContent}"
Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}" Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"
LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}" LeftContent="{Binding $parent[u:UrsaWindow].LeftContent}"
@@ -97,14 +98,17 @@
<ContentPresenter <ContentPresenter
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{TemplateBinding IsTitleVisible}"
Content="{TemplateBinding LeftContent}" /> Content="{TemplateBinding LeftContent}" />
<ContentPresenter <ContentPresenter
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{TemplateBinding IsTitleVisible}"
Content="{TemplateBinding Content}" /> Content="{TemplateBinding Content}" />
<ContentPresenter <ContentPresenter
Grid.Column="2" Grid.Column="2"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{TemplateBinding IsTitleVisible}"
Content="{TemplateBinding RightContent}" /> Content="{TemplateBinding RightContent}" />
<u:CaptionButtons <u:CaptionButtons
x:Name="PART_CaptionButtons" x:Name="PART_CaptionButtons"

9
src/Ursa/Controls/TitleBar/TitleBar.cs
View File

@@ -29,6 +29,15 @@ public class TitleBar: ContentControl
get => GetValue(RightContentProperty); get => GetValue(RightContentProperty);
set => SetValue(RightContentProperty, value); set => SetValue(RightContentProperty, value);
} }
public static readonly StyledProperty<bool> IsTitleVisibleProperty = AvaloniaProperty.Register<TitleBar, bool>(
nameof(IsTitleVisible));
public bool IsTitleVisible
{
get => GetValue(IsTitleVisibleProperty);
set => SetValue(IsTitleVisibleProperty, value);
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {

2
src/Ursa/Windows/UrsaWindow.cs
View File

@@ -47,7 +47,7 @@ public class UrsaWindow: Window
} }
public static readonly StyledProperty<bool> IsTitleBarVisibleProperty = AvaloniaProperty.Register<UrsaWindow, bool>( public static readonly StyledProperty<bool> IsTitleBarVisibleProperty = AvaloniaProperty.Register<UrsaWindow, bool>(
nameof(IsTitleBarVisible)); nameof(IsTitleBarVisible), true);
public bool IsTitleBarVisible public bool IsTitleBarVisible
{ {