From f9b263997f8640ed517dfc1dde2409f5acaf9c97 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 15 Mar 2019 22:21:09 +0100
Subject: [PATCH] Don't override UserControl.StyleKey.

Instead of pinning `UserControl.StyleKey` at `typeof(UserControl)`, make the `UserControl` default template selector `:is(UserControl)`. This will allow controls derived from `UserControl` to be more easily styled.
---
 src/Avalonia.Controls/UserControl.cs         | 3 ---
 src/Avalonia.Themes.Default/UserControl.xaml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls/UserControl.cs b/src/Avalonia.Controls/UserControl.cs
index 3f51f613a4..e42ca5e0e6 100644
--- a/src/Avalonia.Controls/UserControl.cs
+++ b/src/Avalonia.Controls/UserControl.cs
@@ -27,9 +27,6 @@ namespace Avalonia.Controls
             remove { _nameScope.Unregistered -= value; }
         }
 
-        /// <inheritdoc/>
-        Type IStyleable.StyleKey => typeof(UserControl);
-
         /// <inheritdoc/>
         void INameScope.Register(string name, object element)
         {
diff --git a/src/Avalonia.Themes.Default/UserControl.xaml b/src/Avalonia.Themes.Default/UserControl.xaml
index 2bf5f19698..f4d0c21367 100644
--- a/src/Avalonia.Themes.Default/UserControl.xaml
+++ b/src/Avalonia.Themes.Default/UserControl.xaml
@@ -1,4 +1,4 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="UserControl">
+<Style xmlns="https://github.com/avaloniaui" Selector=":is(UserControl)">
   <Setter Property="Template">
     <ControlTemplate>
       <ContentPresenter Name="PART_ContentPresenter"