Skip to content

Commit 3918fd1

Browse files
Default VerticalAlignment properties changed to fix some issues (#2534)
1 parent 3653eaa commit 3918fd1

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

MainDemo.Wpf/MenusAndToolBars.xaml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,38 @@
226226
ClipToBounds="False">
227227
<Menu>
228228
<MenuItem
229-
Header="Nested">
229+
Header="Nested menu">
230230
<MenuItem
231231
Header="Item 1" />
232232
<MenuItem
233233
Header="Item 2" />
234234
</MenuItem>
235-
</Menu>
235+
</Menu>
236+
237+
<Separator />
238+
239+
<ComboBox
240+
Margin="8 0"
241+
Width="80"
242+
Style="{StaticResource MaterialDesignFloatingHintComboBox}"
243+
materialDesign:HintAssist.Hint="Food">
244+
<ComboBoxItem
245+
Content="Fries"
246+
IsSelected="True" />
247+
248+
<ComboBoxItem
249+
Content="Waffles" />
250+
251+
<ComboBoxItem
252+
Content="Chocolate" />
253+
</ComboBox>
254+
255+
<TextBox
256+
Width="80"
257+
Margin="8 0"
258+
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
259+
materialDesign:HintAssist.Hint="Drink"
260+
Text="Beer" />
236261
</ToolBar>
237262
</ToolBarTray>
238263
</smtx:XamlDisplay>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,8 +1328,8 @@
13281328
<Setter Property="Padding" Value="{x:Static wpf:Constants.TextBoxDefaultPadding}" />
13291329
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
13301330
<Setter Property="HorizontalAlignment" Value="Stretch"/>
1331-
<Setter Property="VerticalContentAlignment" Value="Stretch" />
1332-
<Setter Property="VerticalAlignment" Value="Stretch"/>
1331+
<Setter Property="VerticalContentAlignment" Value="Top" />
1332+
<Setter Property="VerticalAlignment" Value="Center"/>
13331333
<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
13341334
<Setter Property="ScrollViewer.PanningMode" Value="Both" />
13351335
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />

0 commit comments

Comments
 (0)