File tree Expand file tree Collapse file tree 2 files changed +29
-4
lines changed
MaterialDesignThemes.Wpf/Themes Expand file tree Collapse file tree 2 files changed +29
-4
lines changed Original file line number Diff line number Diff line change 226
226
ClipToBounds =" False" >
227
227
<Menu >
228
228
<MenuItem
229
- Header =" Nested" >
229
+ Header =" Nested menu " >
230
230
<MenuItem
231
231
Header =" Item 1" />
232
232
<MenuItem
233
233
Header =" Item 2" />
234
234
</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" />
236
261
</ToolBar >
237
262
</ToolBarTray >
238
263
</smtx : XamlDisplay >
Original file line number Diff line number Diff line change 1328
1328
<Setter Property =" Padding" Value =" {x:Static wpf:Constants.TextBoxDefaultPadding}" />
1329
1329
<Setter Property =" HorizontalContentAlignment" Value =" Stretch" />
1330
1330
<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 " />
1333
1333
<Setter Property =" ScrollViewer.CanContentScroll" Value =" True" />
1334
1334
<Setter Property =" ScrollViewer.PanningMode" Value =" Both" />
1335
1335
<Setter Property =" Stylus.IsFlicksEnabled" Value =" False" />
You can’t perform that action at this time.
0 commit comments