From 0f271df11fea4709ca256ef6caeb765feaa1c0d0 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 21 May 2020 18:42:43 -0300 Subject: [PATCH] initial work toward managed caption buttons. --- samples/ControlCatalog/MainWindow.xaml | 119 ++++++++-------------- samples/ControlCatalog/MainWindow.xaml.cs | 6 +- 2 files changed, 44 insertions(+), 81 deletions(-) diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml index b110451421..d293f5cde7 100644 --- a/samples/ControlCatalog/MainWindow.xaml +++ b/samples/ControlCatalog/MainWindow.xaml @@ -7,84 +7,51 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:vm="clr-namespace:ControlCatalog.ViewModels" xmlns:v="clr-namespace:ControlCatalog.Views" - ExtendClientAreaToDecorationsHint="{Binding ExtendClientAreaEnabled}" - ExtendClientAreaChromeHints="{Binding ChromeHints}" - ExtendClientAreaTitleBarHeightHint="{Binding TitleBarHeight}" + ExtendClientAreaToDecorationsHint="True" + ExtendClientAreaChromeHints="Default" + ExtendClientAreaTitleBarHeightHint="-1" TransparencyLevelHint="{Binding TransparencyLevel}" x:Name="MainWindow" x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}" Background="{x:Null}"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs index d97325ef8d..bd5bf2930c 100644 --- a/samples/ControlCatalog/MainWindow.xaml.cs +++ b/samples/ControlCatalog/MainWindow.xaml.cs @@ -27,11 +27,7 @@ namespace ControlCatalog MaxItems = 3 }; - DataContext = new MainWindowViewModel(_notificationArea); - _recentMenu = ((NativeMenu.GetMenu(this).Items[0] as NativeMenuItem).Menu.Items[2] as NativeMenuItem).Menu; - - var mainMenu = this.FindControl("MainMenu"); - mainMenu.AttachedToVisualTree += MenuAttached; + DataContext = new MainWindowViewModel(_notificationArea); } public static string MenuQuitHeader => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Quit Avalonia" : "E_xit";