From 22879fe31266b3b7074df466c6753b40a7239d0d Mon Sep 17 00:00:00 2001 From: Tom Daffin Date: Sat, 3 Nov 2018 08:00:01 -0600 Subject: [PATCH 1/8] Call GtkImContextFilterKeypress after issuing the KeyDown event to get the same sequence of events as windows --- src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs index 0273f6a7d8..304d17b33e 100644 --- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs +++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs @@ -222,14 +222,14 @@ namespace Avalonia.Gtk3 { var evnt = (GdkEventKey*) pev; _lastKbdEvent = evnt->time; - if (Native.GtkImContextFilterKeypress(_imContext, pev)) - return true; var e = new RawKeyEventArgs( Gtk3Platform.Keyboard, evnt->time, evnt->type == GdkEventType.KeyPress ? RawKeyEventType.KeyDown : RawKeyEventType.KeyUp, Avalonia.Gtk.Common.KeyTransform.ConvertKey((GdkKey)evnt->keyval), GetModifierKeys((GdkModifierType)evnt->state)); OnInput(e); + if (Native.GtkImContextFilterKeypress(_imContext, pev)) + return true; return true; } From 860eddb3440149d22ed1a4014953855f95fa9377 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Mon, 12 Nov 2018 15:16:51 +0300 Subject: [PATCH 2/8] Fixed #2094 --- samples/ControlCatalog.Desktop/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs index a2048005a4..329b2ab5a3 100644 --- a/samples/ControlCatalog.Desktop/Program.cs +++ b/samples/ControlCatalog.Desktop/Program.cs @@ -22,7 +22,7 @@ namespace ControlCatalog /// This method is needed for IDE previewer infrastructure /// public static AppBuilder BuildAvaloniaApp() - => AppBuilder.Configure().LogToDebug().UsePlatformDetect(); + => AppBuilder.Configure().LogToDebug().UsePlatformDetect().UseReactiveUI(); private static void ConfigureAssetAssembly(AppBuilder builder) { From c083af062d77ec6a30814aed1f27c49d6d7e3f91 Mon Sep 17 00:00:00 2001 From: Andrey Kunchev Date: Tue, 13 Nov 2018 02:58:53 +0200 Subject: [PATCH 3/8] add Avalonia.Layout to https://github.com/avaloniaui --- src/Avalonia.Layout/Properties/AssemblyInfo.cs | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/Avalonia.Layout/Properties/AssemblyInfo.cs diff --git a/src/Avalonia.Layout/Properties/AssemblyInfo.cs b/src/Avalonia.Layout/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..70fc1e9330 --- /dev/null +++ b/src/Avalonia.Layout/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// Copyright (c) The Avalonia Project. All rights reserved. +// Licensed under the MIT license. See licence.md file in the project root for full license information. + +using Avalonia.Metadata; + +[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")] From 855bc7d1caa59710a451b51a8b3f6812d534005e Mon Sep 17 00:00:00 2001 From: wieslawsoltes Date: Wed, 14 Nov 2018 12:52:53 +0000 Subject: [PATCH 4/8] Fix ButtonSpinner styles --- .../ButtonSpinner.xaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/ButtonSpinner.xaml index ddeef44011..5417d5fb0b 100644 --- a/src/Avalonia.Themes.Default/ButtonSpinner.xaml +++ b/src/Avalonia.Themes.Default/ButtonSpinner.xaml @@ -1,17 +1,17 @@ - + + From 8b0c81ac3d194ab203a9f733b4c3a9dd3abc53b3 Mon Sep 17 00:00:00 2001 From: wieslawsoltes Date: Wed, 14 Nov 2018 12:53:37 +0000 Subject: [PATCH 5/8] Fix NumericUpDown styles --- .../NumericUpDown.xaml | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/Avalonia.Themes.Default/NumericUpDown.xaml b/src/Avalonia.Themes.Default/NumericUpDown.xaml index 8c5594cee8..0433d6734b 100644 --- a/src/Avalonia.Themes.Default/NumericUpDown.xaml +++ b/src/Avalonia.Themes.Default/NumericUpDown.xaml @@ -1,10 +1,9 @@ + \ No newline at end of file From 98eb338b8dfdb424ec85933351ae0f2850dc33a0 Mon Sep 17 00:00:00 2001 From: wieslawsoltes Date: Wed, 14 Nov 2018 13:26:17 +0000 Subject: [PATCH 6/8] Updated NumericUpDown style --- src/Avalonia.Themes.Default/NumericUpDown.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Themes.Default/NumericUpDown.xaml b/src/Avalonia.Themes.Default/NumericUpDown.xaml index 0433d6734b..24cbb62908 100644 --- a/src/Avalonia.Themes.Default/NumericUpDown.xaml +++ b/src/Avalonia.Themes.Default/NumericUpDown.xaml @@ -1,8 +1,9 @@ From f01fa29aecf787348d294fc2ad3d991d60e11bf2 Mon Sep 17 00:00:00 2001 From: wieslawsoltes Date: Wed, 14 Nov 2018 13:28:03 +0000 Subject: [PATCH 7/8] Do not set Height --- samples/ControlCatalog/Pages/NumericUpDownPage.xaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml index 2bb6214b58..9b66500a2a 100644 --- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml +++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml @@ -52,19 +52,19 @@ Minimum: + CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Margin="2" Width="70" HorizontalAlignment="Center"/> Maximum: + CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Margin="2" Width="70" HorizontalAlignment="Center"/> Increment: + Margin="2" Width="70" HorizontalAlignment="Center"/> Value: + Margin="2" Width="70" HorizontalAlignment="Center"/> @@ -72,7 +72,7 @@ Usage of NumericUpDown: From 811adc17b4f330a62e56451687aab78b70c5e0a8 Mon Sep 17 00:00:00 2001 From: wieslawsoltes Date: Wed, 14 Nov 2018 13:39:02 +0000 Subject: [PATCH 8/8] Use auto row height --- samples/ControlCatalog/Pages/NumericUpDownPage.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml index 9b66500a2a..e263f59b8d 100644 --- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml +++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml @@ -6,7 +6,7 @@ Features: - + ShowButtonSpinner: @@ -20,7 +20,7 @@ - + FormatString: @@ -49,7 +49,7 @@ Text: - + Minimum: