Browse Source
Merge pull request #9665 from workgroupengineering/fixes/EmbeddableControlRoot-Style
fix: EmbeddableControlRoot Themes
pull/9672/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
2 additions and
2 deletions
-
src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
-
src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
-
src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
|
|
|
@ -4,7 +4,6 @@ using Avalonia.Controls.Platform; |
|
|
|
using Avalonia.Input; |
|
|
|
using Avalonia.Platform; |
|
|
|
using Avalonia.Styling; |
|
|
|
using JetBrains.Annotations; |
|
|
|
|
|
|
|
namespace Avalonia.Controls.Embedding |
|
|
|
{ |
|
|
|
@ -12,7 +11,6 @@ namespace Avalonia.Controls.Embedding |
|
|
|
{ |
|
|
|
public EmbeddableControlRoot(ITopLevelImpl impl) : base(impl) |
|
|
|
{ |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public EmbeddableControlRoot() : base(PlatformManager.CreateEmbeddableWindow()) |
|
|
|
|
|
|
|
@ -1,6 +1,7 @@ |
|
|
|
<ResourceDictionary xmlns="https://github.com/avaloniaui" |
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|
|
|
<ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot"> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/> |
|
|
|
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundAltHighBrush}"/> |
|
|
|
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/> |
|
|
|
<Setter Property="Template"> |
|
|
|
|
|
|
|
@ -2,6 +2,7 @@ |
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|
|
|
<ControlTheme x:Key="{x:Type EmbeddableControlRoot}" |
|
|
|
TargetType="EmbeddableControlRoot"> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" /> |
|
|
|
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" /> |
|
|
|
<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" /> |
|
|
|
<Setter Property="Template"> |
|
|
|
|