Skip to content

Commit 5f03da3

Browse files
authored
Merge pull request #899 from glen-nicol/combobox_hint_scaling
Added Scale and Offset to the combobox template
2 parents 58730fd + 57ff327 commit 5f03da3

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

MainDemo.Wpf/TextFields.xaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,21 @@
197197
</ComboBox.ItemsPanel>
198198
</ComboBox>
199199
</smtx:XamlDisplay>
200+
<smtx:XamlDisplay Key="fields_27">
201+
<ComboBox materialDesign:HintAssist.Hint="(large float hint)"
202+
materialDesign:HintAssist.FloatingScale="1.5"
203+
materialDesign:HintAssist.FloatingOffset="0, -24"
204+
MinWidth="72"
205+
Margin="16 0 0 0"
206+
ItemsSource="{Binding LongListToTestComboVirtualization}"
207+
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
208+
<ComboBox.ItemsPanel>
209+
<ItemsPanelTemplate>
210+
<VirtualizingStackPanel />
211+
</ItemsPanelTemplate>
212+
</ComboBox.ItemsPanel>
213+
</ComboBox>
214+
</smtx:XamlDisplay>
200215
</StackPanel>
201216
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0 16 0 5">Disabled Controls</TextBlock>
202217
<StackPanel Orientation="Horizontal">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,8 @@
437437
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
438438
UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
439439
UseFloating="{Binding Path=(wpf:HintAssist.IsFloating), RelativeSource={RelativeSource TemplatedParent}}"
440+
FloatingScale="{Binding Path=(wpf:HintAssist.FloatingScale), RelativeSource={RelativeSource TemplatedParent}}"
441+
FloatingOffset="{Binding Path=(wpf:HintAssist.FloatingOffset), RelativeSource={RelativeSource TemplatedParent}}"
440442
HintOpacity="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
441443
Hint="{TemplateBinding wpf:HintAssist.Hint}" />
442444
</Grid>

0 commit comments

Comments
 (0)