diff --git a/demo/Ursa.Demo/App.axaml.cs b/demo/Ursa.Demo/App.axaml.cs index 1b2ba8a..71665e9 100644 --- a/demo/Ursa.Demo/App.axaml.cs +++ b/demo/Ursa.Demo/App.axaml.cs @@ -1,4 +1,5 @@ using Avalonia; +using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; using Ursa.Demo.ViewModels; @@ -17,8 +18,9 @@ public partial class App : Application { if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { - desktop.MainWindow = new MainWindow() + desktop.MainWindow = new Window() { + Content = new SingleView(), DataContext = new MainViewViewModel(), }; } diff --git a/src/Ursa.Themes.Semi/Controls/UrsaView.axaml b/src/Ursa.Themes.Semi/Controls/UrsaView.axaml index e67c584..92c0989 100644 --- a/src/Ursa.Themes.Semi/Controls/UrsaView.axaml +++ b/src/Ursa.Themes.Semi/Controls/UrsaView.axaml @@ -20,12 +20,13 @@ VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" /> - + Margin="{Binding $parent[u:UrsaWindow].TitleBarMargin}"> + + + + diff --git a/src/Ursa.Themes.Semi/Styles/UrsaView.axaml b/src/Ursa.Themes.Semi/Styles/UrsaView.axaml new file mode 100644 index 0000000..b243045 --- /dev/null +++ b/src/Ursa.Themes.Semi/Styles/UrsaView.axaml @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/Ursa.Themes.Semi/Styles/_index.axaml b/src/Ursa.Themes.Semi/Styles/_index.axaml index 8de34d2..e17a4a3 100644 --- a/src/Ursa.Themes.Semi/Styles/_index.axaml +++ b/src/Ursa.Themes.Semi/Styles/_index.axaml @@ -10,5 +10,6 @@ +