[DevExpress] Add default text styling (#109)

Author: apman

samples/SampleApp/App.axaml

@@ -4,8 +4,8 @@
 
   <Application.Styles>
     <!-- <FluentTheme /> -->
-    <StyleInclude Source="avares://Devolutions.AvaloniaTheme.MacOS/MacOSTheme.axaml" />
-    <!-- <StyleInclude Source="avares://Devolutions.AvaloniaTheme.DevExpress/DevExpressTheme.axaml" /> -->
+    <!-- <StyleInclude Source="avares://Devolutions.AvaloniaTheme.MacOS/MacOSTheme.axaml" /> -->
+    <StyleInclude Source="avares://Devolutions.AvaloniaTheme.DevExpress/DevExpressTheme.axaml" />
     <StyleInclude Source="/Styles.axaml" />
   </Application.Styles>
 </Application>

src/Devolutions.AvaloniaTheme.DevExpress/Accents/Styles.axaml

@@ -1,15 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <!-- FontFamily should be inherited from Window normally. Adding this for RDM where the views are embedded into the native app without a Window -->
-  <Style Selector="TextBlock, AccessText">
-    <Setter Property="FontFamily" Value="{StaticResource DevExpressThemeFontFamily}" />
-  </Style>
-
-  <Style Selector="TextBlock">
-    <Setter Property="FontSize" Value="12" />
-  </Style>
-
   <Style Selector="TextBlock.SectionTitle">
     <Setter Property="FontWeight" Value="Bold" />
     <Setter Property="FontSize" Value="14" />
@@ -23,13 +14,11 @@
   </Style>
 
   <Style Selector="AutoCompleteBox">
-    <Setter Property="FontSize" Value="12" />
     <Setter Property="MinHeight" Value="1" />
     <Setter Property="Padding" Value="10 3" />
   </Style>
 
   <Style Selector="AutoCompleteBox ListBoxItem">
-    <Setter Property="FontSize" Value="12" />
     <Setter Property="MinHeight" Value="1" />
     <Setter Property="Height" Value="26" />
     <Setter Property="Padding" Value="10 2" />

src/Devolutions.AvaloniaTheme.DevExpress/Accents/ThemeResources.axaml

@@ -43,6 +43,7 @@
   <SolidColorBrush x:Key="TransparentBrush" Color="Transparent" />
 
   <FontFamily x:Key="DevExpressThemeFontFamily">Segoe UI, Helvetica Neue, Arial, sans-serif</FontFamily>
+  <x:Double x:Key="DefaultFontSize">12</x:Double>
   <x:Double x:Key="ControlFontSize">12</x:Double>
   <x:Double x:Key="PasswordHiddenFontSize">10</x:Double>
 

src/Devolutions.AvaloniaTheme.DevExpress/Controls/Button.axaml

@@ -27,7 +27,7 @@
     <Setter Property="Padding" Value="5 0 5 0 " />
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="12" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlFontSize}" />
     <Setter Property="FontWeight" Value="Light" />
     <Setter Property="Template">
       <ControlTemplate>

src/Devolutions.AvaloniaTheme.DevExpress/Controls/ComboBox.axaml

@@ -38,7 +38,7 @@
     <Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
     <Setter Property="FocusAdorner" Value="{x:Null}" />
     <Setter Property="MaxDropDownHeight" Value="504" />
-    <Setter Property="FontSize" Value="12" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource ForegroundHighBrush}" />
     <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrush}" />

src/Devolutions.AvaloniaTheme.DevExpress/Controls/ComboBoxItem.axaml

@@ -25,7 +25,7 @@
   </Design.PreviewWith>
 
   <ControlTheme x:Key="{x:Type ComboBoxItem}" TargetType="ComboBoxItem">
-    <Setter Property="FontSize" Value="12" />
+    <Setter Property="FontSize" Value="{DynamicResource ControlFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource ForegroundHighBrush}" />
     <Setter Property="Background" Value="{DynamicResource BackgroundColor}" />
     <Setter Property="Padding" Value="10 3 " />

src/Devolutions.AvaloniaTheme.DevExpress/Controls/EmbeddableControlRoot.axaml

@@ -0,0 +1,26 @@
+<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="Background" Value="{DynamicResource SystemRegionBrush}" />
+    <Setter Property="TopLevel.SystemBarColor" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource ForegroundHighBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+    <Setter Property="FontFamily" Value="{StaticResource DevExpressThemeFontFamily}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+          <Border Background="{TemplateBinding Background}">
+            <VisualLayerManager>
+              <ContentPresenter Name="PART_ContentPresenter"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Margin="{TemplateBinding Padding}" />
+            </VisualLayerManager>
+          </Border>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>

src/Devolutions.AvaloniaTheme.DevExpress/Controls/Window.axaml

@@ -5,7 +5,8 @@
     <Setter Property="Background" Value="{DynamicResource SystemRegionBrush}" />
     <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
     <Setter Property="TopLevel.SystemBarColor" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource ForegroundHighBrush}" />
+    <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
     <Setter Property="FontFamily" Value="{StaticResource DevExpressThemeFontFamily}" />
     <Setter Property="Template">
       <ControlTemplate>

src/Devolutions.AvaloniaTheme.DevExpress/Controls/_index.axaml

@@ -5,6 +5,7 @@
     <MergeResourceInclude Source="Button.axaml" />
     <MergeResourceInclude Source="ComboBox.axaml" />
     <MergeResourceInclude Source="ComboBoxItem.axaml" />
+    <MergeResourceInclude Source="EmbeddableControlRoot.axaml" />
     <MergeResourceInclude Source="TabControl.axaml" />
     <MergeResourceInclude Source="TabItem.axaml" />
     <MergeResourceInclude Source="TextBox.axaml" />