Skip to content

Commit 646d0a7

Browse files
committed
fix floting hint font size on editable combo
1 parent a98be99 commit 646d0a7

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</Setter>
9292
</Style>
9393

94-
<Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
94+
<Style x:Key="MaterialDesignComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
9595
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
9696
<Setter Property="OverridesDefaultStyle" Value="true"/>
9797
<Setter Property="IsTabStop" Value="false"/>
@@ -174,7 +174,7 @@
174174
</Border>
175175
</Border>
176176
</Popup>
177-
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
177+
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource MaterialDesignComboBoxToggleButton}"
178178
/>
179179
<TextBlock x:Name="Hint"
180180
Margin="{TemplateBinding Padding}"
@@ -279,7 +279,7 @@
279279
</Border>
280280
</Border>
281281
</Popup>
282-
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
282+
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource MaterialDesignComboBoxToggleButton}"
283283
/>
284284
<TextBlock x:Name="Hint"
285285
Margin="{TemplateBinding Padding}"
@@ -332,7 +332,7 @@
332332
</ControlTemplate.Triggers>
333333
</ControlTemplate>
334334

335-
<Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
335+
<Style x:Key="MaterialDesignComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
336336
<Setter Property="OverridesDefaultStyle" Value="true"/>
337337
<Setter Property="AllowDrop" Value="true"/>
338338
<Setter Property="MinWidth" Value="0"/>
@@ -373,7 +373,7 @@
373373
</ScrollViewer>
374374
</Border>
375375
</Popup>
376-
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
376+
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource MaterialDesignComboBoxToggleButton}"/>
377377
<Border x:Name="border" Background="Transparent" Margin="{TemplateBinding BorderThickness}">
378378
<Grid>
379379
<TextBlock x:Name="Hint"
@@ -384,7 +384,7 @@
384384
Text="{TemplateBinding wpf:TextField.Hint}"
385385
IsHitTestVisible="False"
386386
Visibility="{TemplateBinding Text, Converter={StaticResource TextFieldHintVisibilityConverter}}" />
387-
<TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
387+
<TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource MaterialDesignComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
388388
</Grid>
389389
</Border>
390390
<Border BorderBrush="{DynamicResource PrimaryHueMidBrush}" BorderThickness="0 0 0 2"
@@ -480,18 +480,19 @@
480480
</ScrollViewer>
481481
</Border>
482482
</Popup>
483-
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
483+
<ToggleButton x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource MaterialDesignComboBoxToggleButton}"
484484
Margin="0 14 0 0"/>
485485
<Border x:Name="border" Background="Transparent" Margin="{TemplateBinding BorderThickness}">
486486
<Grid Margin="0 14 0 0">
487487
<TextBlock x:Name="Hint"
488-
Margin="{TemplateBinding Padding}"
489-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
490-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
491-
Opacity="{Binding Path=(wpf:TextField.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
492-
Text="{TemplateBinding wpf:TextField.Hint}"
493-
IsHitTestVisible="False" />
494-
<TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
488+
FontSize="{TemplateBinding FontSize}"
489+
Margin="{TemplateBinding Padding}"
490+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
491+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
492+
Opacity="{Binding Path=(wpf:TextField.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
493+
Text="{TemplateBinding wpf:TextField.Hint}"
494+
IsHitTestVisible="False" />
495+
<TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource MaterialDesignComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
495496
</Grid>
496497
</Border>
497498
<Border BorderBrush="{DynamicResource PrimaryHueMidBrush}" BorderThickness="0 0 0 2"

0 commit comments

Comments
 (0)