Merge pull request #840 from MakesYT/development

Fix dynamic style binding
lepoco · Nov 23, 2023 · 8dbb625 · 8dbb625
2 parents e77ea4e + f8f6ac4
commit 8dbb625
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 73 deletions.
diff --git a/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj b/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj
@@ -22,6 +22,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile Condition="'$(Configuration)'=='Release'">true</GenerateDocumentationFile>
+    <DebugType Condition="'$(Configuration)'=='Release'">none</DebugType>
     <PackageIcon>wpfui.png</PackageIcon>
   </PropertyGroup>
 

diff --git a/src/Wpf.Ui/Controls/Expander/Expander.xaml b/src/Wpf.Ui/Controls/Expander/Expander.xaml
@@ -30,6 +30,7 @@
                 Grid.Column="0"
                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                TextElement.FontSize="{TemplateBinding FontSize}"
                 Content="{TemplateBinding Content}" />
             <Grid
                 x:Name="ChevronGrid"

diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -184,6 +184,7 @@
                             Margin="0"
                             Padding="1,0"
                             VerticalAlignment="Center"
+                            FontSize="{TemplateBinding FontSize}"
                             Foreground="{DynamicResource TextControlPlaceholderForeground}"
                             Text="{TemplateBinding PlaceholderText}" />
                     </Grid>

diff --git a/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml b/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml
@@ -53,7 +53,8 @@
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                            TextElement.Foreground="{TemplateBinding Foreground}"
+                            TextElement.FontSize="{TemplateBinding FontSize}"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>

diff --git a/src/Wpf.Ui/Resources/Theme/Dark.xaml b/src/Wpf.Ui/Resources/Theme/Dark.xaml
diff --git a/src/Wpf.Ui/Resources/Theme/Light.xaml b/src/Wpf.Ui/Resources/Theme/Light.xaml
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj
@@ -20,6 +20,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile Condition="'$(Configuration)'=='Release'">true</GenerateDocumentationFile>
+    <DebugType Condition="'$(Configuration)'=='Release'">none</DebugType>
     <PackageIcon>wpfui.png</PackageIcon>
   </PropertyGroup>