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
parent
commit
eb9d61f7c3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
  2. 1
      src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
  3. 1
      src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml

2
src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs

@ -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
src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml

@ -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">

1
src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml

@ -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">

Loading…
Cancel
Save