Skip to content

Commit 4df1343

Browse files
committed
Fixes #1191
1 parent 7f6b2c8 commit 4df1343

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- Simplified state was not updated when items changed
88
- [#1165](../../issues/1165) - ScreenTip is not DPI aware
99
- [#1183](../../issues/1183) - MenuItems, having a submenu, do not stay highlighted when MenuItem from the submenu is highlighted
10-
- [#1191](../../issues/1191) - Content-Control of DropDownButton has unwanted MinHeight
10+
- [#1191](../../issues/1191) - Popup of DropDownButton/SplitButton has unwanted MinHeight
1111

1212
- ### Enhancements/Features
1313

Fluent.Ribbon/Themes/Controls/DropDownButton.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@
263263
PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
264264
<Fluent:ResizeableContentControl x:Name="PART_PopupContentControl"
265265
MinWidth="{TemplateBinding ActualWidth}"
266-
MinHeight="{TemplateBinding ActualHeight}"
267266
MaxHeight="{TemplateBinding MaxDropDownHeight}"
268267
IsEnabled="{TemplateBinding IsEnabled}"
269268
ResizeMode="{TemplateBinding ResizeMode}">

Fluent.Ribbon/Themes/Controls/SplitButton.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
123123
<Fluent:ResizeableContentControl x:Name="PART_PopupContentControl"
124124
MinWidth="{TemplateBinding ActualWidth}"
125-
MinHeight="{TemplateBinding ActualHeight}"
126125
MaxHeight="{TemplateBinding MaxDropDownHeight}"
127126
IsEnabled="{TemplateBinding IsEnabled}"
128127
ResizeMode="{TemplateBinding ResizeMode}">
@@ -259,8 +258,8 @@
259258
PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
260259
<Fluent:ResizeableContentControl x:Name="PART_PopupContentControl"
261260
MinWidth="{TemplateBinding ActualWidth}"
262-
MinHeight="{TemplateBinding ActualHeight}"
263261
MaxHeight="{TemplateBinding MaxDropDownHeight}"
262+
IsEnabled="{TemplateBinding IsEnabled}"
264263
ResizeMode="{TemplateBinding ResizeMode}">
265264
<ScrollViewer x:Name="PART_ScrollViewer"
266265
Style="{DynamicResource Fluent.Ribbon.Styles.MenuScrollViewer}"

0 commit comments

Comments
 (0)