Browse Source
Merge pull request #2374 from AvaloniaUI/fixes/2280-style-usercontrols
Don't override UserControl.StyleKey.
pull/2382/head
Jumar Macato
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
4 deletions
-
src/Avalonia.Controls/UserControl.cs
-
src/Avalonia.Themes.Default/UserControl.xaml
|
|
|
@ -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) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -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" |
|
|
|
|
