From 1fcc1b877897189608ddec5a5359e0e6273087fc Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 28 May 2020 14:39:46 -0300 Subject: [PATCH] revert controlcatalog changes. --- samples/ControlCatalog/MainView.xaml.cs | 46 ++++++++++++------------- samples/ControlCatalog/MainWindow.xaml | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs index fceca426f4..2d01d37dbe 100644 --- a/samples/ControlCatalog/MainView.xaml.cs +++ b/samples/ControlCatalog/MainView.xaml.cs @@ -32,30 +32,30 @@ namespace ControlCatalog } - //var light = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog")) - //{ - // Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default") - //}; - //var dark = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog")) - //{ - // Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default") - //}; + var light = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog")) + { + Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default") + }; + var dark = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog")) + { + Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default") + }; - - //var themes = this.Find("Themes"); - //themes.SelectionChanged += (sender, e) => - //{ - // switch (themes.SelectedIndex) - // { - // case 0: - // Styles[0] = light; - // break; - // case 1: - // Styles[0] = dark; - // break; - // } - //}; - //Styles.Add(light); + + var themes = this.Find("Themes"); + themes.SelectionChanged += (sender, e) => + { + switch (themes.SelectedIndex) + { + case 0: + Styles[0] = light; + break; + case 1: + Styles[0] = dark; + break; + } + }; + Styles.Add(light); var decorations = this.Find("Decorations"); decorations.SelectionChanged += (sender, e) => diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml index 670e30725b..a0bb956425 100644 --- a/samples/ControlCatalog/MainWindow.xaml +++ b/samples/ControlCatalog/MainWindow.xaml @@ -7,7 +7,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:vm="clr-namespace:ControlCatalog.ViewModels" xmlns:v="clr-namespace:ControlCatalog.Views" - x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}"> + x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}" Background="Transparent">