From eddabf7d540606cc3d7817df3b24458c8847c93f Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 9 Sep 2017 03:01:04 +0300 Subject: [PATCH] Added "System dialogs" page for ControlCatalog --- samples/ControlCatalog/ControlCatalog.csproj | 6 +++ samples/ControlCatalog/MainView.xaml | 2 +- samples/ControlCatalog/MainView.xaml.cs | 9 ++++ samples/ControlCatalog/MainWindow.xaml.cs | 2 +- samples/ControlCatalog/Pages/DialogsPage.xaml | 11 +++++ .../ControlCatalog/Pages/DialogsPage.xaml.cs | 42 +++++++++++++++++++ 6 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 samples/ControlCatalog/Pages/DialogsPage.xaml create mode 100644 samples/ControlCatalog/Pages/DialogsPage.xaml.cs diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 99ddce0757..4e2dfb9969 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -32,6 +32,9 @@ Designer + + Designer + Designer @@ -86,6 +89,9 @@ MainWindow.xaml + + DialogsPage.xaml + BorderPage.xaml diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml index 7dd026c124..6c432a90ac 100644 --- a/samples/ControlCatalog/MainView.xaml +++ b/samples/ControlCatalog/MainView.xaml @@ -1,7 +1,7 @@ - + diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs index 2e1f7d38b2..f065be55aa 100644 --- a/samples/ControlCatalog/MainView.xaml.cs +++ b/samples/ControlCatalog/MainView.xaml.cs @@ -1,6 +1,9 @@ +using System.Collections; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using Avalonia.Platform; +using ControlCatalog.Pages; namespace ControlCatalog { @@ -9,6 +12,12 @@ namespace ControlCatalog public MainView() { this.InitializeComponent(); + if (AvaloniaLocator.Current.GetService().GetRuntimeInfo().IsDesktop) + ((IList) this.FindControl("Sidebar").Items).Add(new TabItem() + { + Header = "System dialogs", + Content = new DialogsPage() + }); } private void InitializeComponent() diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs index 65c37c898b..ed0bffdf10 100644 --- a/samples/ControlCatalog/MainWindow.xaml.cs +++ b/samples/ControlCatalog/MainWindow.xaml.cs @@ -11,7 +11,7 @@ namespace ControlCatalog { this.InitializeComponent(); this.AttachDevTools(); - Renderer.DrawDirtyRects = Renderer.DrawFps = true; + //Renderer.DrawDirtyRects = Renderer.DrawFps = true; } private void InitializeComponent() diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml new file mode 100644 index 0000000000..12be105469 --- /dev/null +++ b/samples/ControlCatalog/Pages/DialogsPage.xaml @@ -0,0 +1,11 @@ + + + + + + + + Modal to window + + + \ No newline at end of file diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs new file mode 100644 index 0000000000..e9c95c20e4 --- /dev/null +++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs @@ -0,0 +1,42 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +#pragma warning disable 4014 + +namespace ControlCatalog.Pages +{ + public class DialogsPage : UserControl + { + public DialogsPage() + { + this.InitializeComponent(); + this.FindControl