From 4f902c455257549535306ad08c2fbb5f421c13d5 Mon Sep 17 00:00:00 2001
From: Matthijs ter Woord <matthijs@terwoord.eu>
Date: Tue, 22 Aug 2017 18:17:36 +0200
Subject: [PATCH 1/5] Add IsPressed property on Button

---
 src/Avalonia.Controls/Button.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 78bbd836be..dee8969a17 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -68,6 +68,9 @@ namespace Avalonia.Controls
         public static readonly RoutedEvent<RoutedEventArgs> ClickEvent =
             RoutedEvent.Register<Button, RoutedEventArgs>("Click", RoutingStrategies.Bubble);
 
+        public static readonly AvaloniaProperty<bool> IsPressedProperty =
+            AvaloniaProperty.RegisterDirect<Button, bool>(nameof(IsPressed), b => b.IsPressed);
+
         /// <summary>
         /// Initializes static members of the <see cref="Button"/> class.
         /// </summary>
@@ -134,6 +137,12 @@ namespace Avalonia.Controls
             set { SetValue(IsDefaultProperty, value); }
         }
 
+        public bool IsPressed
+        {
+            get { return GetValue(IsPressedProperty); }
+            private set { SetValue(IsPressedProperty, value); }
+        }
+
         /// <inheritdoc/>
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
@@ -164,7 +173,7 @@ namespace Avalonia.Controls
                 {
                     RaiseClickEvent();
                 }
-
+                IsPressed = true;
                 e.Handled = true;
             }
 
@@ -180,7 +189,7 @@ namespace Avalonia.Controls
                 {
                     RaiseClickEvent();
                 }
-
+                IsPressed = false;
                 e.Handled = true;
             }
         }
@@ -223,6 +232,7 @@ namespace Avalonia.Controls
             {
                 PseudoClasses.Add(":pressed");
                 e.Device.Capture(this);
+                IsPressed = true;
                 e.Handled = true;
 
                 if (ClickMode == ClickMode.Press)
@@ -241,6 +251,7 @@ namespace Avalonia.Controls
             {
                 e.Device.Capture(null);
                 PseudoClasses.Remove(":pressed");
+                IsPressed = false;
                 e.Handled = true;
 
                 if (ClickMode == ClickMode.Release && new Rect(Bounds.Size).Contains(e.GetPosition(this)))

From bfd7de2427c26edeae56b38985f2741fc54aadba Mon Sep 17 00:00:00 2001
From: Matthijs ter Woord <matthijs@terwoord.eu>
Date: Tue, 22 Aug 2017 18:37:08 +0200
Subject: [PATCH 2/5] IsPressed property should be a StyledProperty, otherwise
 stackoverflow occurs

---
 src/Avalonia.Controls/Button.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index 964ffbbac4..a5ace095b6 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -72,8 +72,8 @@ namespace Avalonia.Controls
 
         private ICommand _command;
 
-        public static readonly AvaloniaProperty<bool> IsPressedProperty =
-            AvaloniaProperty.RegisterDirect<Button, bool>(nameof(IsPressed), b => b.IsPressed);
+        public static readonly StyledProperty<bool> IsPressedProperty =
+            AvaloniaProperty.Register<Button, bool>(nameof(IsPressed));
 
         /// <summary>
         /// Initializes static members of the <see cref="Button"/> class.

From 981cf5a2f158e34a1f28db10af3c3c988013d900 Mon Sep 17 00:00:00 2001
From: Matthijs ter Woord <matthijs@terwoord.eu>
Date: Fri, 1 Sep 2017 15:17:09 +0200
Subject: [PATCH 3/5] Now we have .IsPressed property, have the PseudoClass
 method handle that for us.

---
 src/Avalonia.Controls/Button.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index a5ace095b6..aa486422fd 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -84,6 +84,7 @@ namespace Avalonia.Controls
             ClickEvent.AddClassHandler<Button>(x => x.OnClick);
             CommandProperty.Changed.Subscribe(CommandChanged);
             IsDefaultProperty.Changed.Subscribe(IsDefaultChanged);
+            PseudoClass(IsPressedProperty, ":pressed");
         }
 
         /// <summary>
@@ -234,7 +235,6 @@ namespace Avalonia.Controls
 
             if (e.MouseButton == MouseButton.Left)
             {
-                PseudoClasses.Add(":pressed");
                 e.Device.Capture(this);
                 IsPressed = true;
                 e.Handled = true;
@@ -254,7 +254,6 @@ namespace Avalonia.Controls
             if (e.MouseButton == MouseButton.Left)
             {
                 e.Device.Capture(null);
-                PseudoClasses.Remove(":pressed");
                 IsPressed = false;
                 e.Handled = true;
 

From 4546f05f41a3c5a98583a5ae49882ace120d884f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 13 Sep 2017 00:27:27 +0200
Subject: [PATCH 4/5] Removed outdated submodule.

---
 src/Avalonia.ReactiveUI/src | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 src/Avalonia.ReactiveUI/src

diff --git a/src/Avalonia.ReactiveUI/src b/src/Avalonia.ReactiveUI/src
deleted file mode 160000
index 3f725c808b..0000000000
--- a/src/Avalonia.ReactiveUI/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3f725c808b1d4c8457f0d3204e0a071aa462cd75

From 95e54063ed729e5d7e6dc8c0ffd626c06c3bab44 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 13 Sep 2017 00:33:03 +0200
Subject: [PATCH 5/5] Use correct portable.xaml submodule commit.

---
 .../Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index dfc5affa5d..eebf9dbb92 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit dfc5affa5d8f4ddf5a7707e3202d5593519de640
+Subproject commit eebf9dbb9275ecc48c18ec24f6fbad8cb494857f