Skip to content

Commit 8df58c1

Browse files
committed
coding standards
1 parent 0edaf85 commit 8df58c1

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

MainDemo.Wpf/Buttons.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
<CheckBox Grid.Column="1" Grid.Row="2" IsChecked="True" VerticalAlignment="Bottom" />
120120
<CheckBox Grid.Column="1" Grid.Row="3" VerticalAlignment="Bottom" />
121121
<ComboBox Grid.Column="0" Grid.Row="4" materialDesign:HintAssist.Hint="Setting 4" materialDesign:HintAssist.IsFloating="True"
122+
MaxDropDownHeight="200"
122123
Margin="8 8 8 8">
123124
<ComboBoxItem>25%</ComboBoxItem>
124125
<ComboBoxItem>50%</ComboBoxItem>
@@ -127,7 +128,7 @@
127128
<ComboBoxItem>150%</ComboBoxItem>
128129
<ComboBoxItem>200%</ComboBoxItem>
129130
<ComboBoxItem>250%</ComboBoxItem>
130-
<ComboBoxItem>500%</ComboBoxItem>
131+
<ComboBoxItem>501%</ComboBoxItem>
131132
</ComboBox>
132133
</Grid>
133134

MaterialDesignThemes.Wpf/PopupBox.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,9 @@ private static void OnLostMouseCapture(object sender, MouseEventArgs e)
659659
{
660660
if (popupBox.StaysOpen && popupBox.IsPopupOpen)
661661
{
662-
// Fix for ComboBox scrolling
663-
if (GetCapture() != IntPtr.Zero) return;
664-
662+
// allow scrolling
663+
if (GetCapture() != IntPtr.Zero) return;
664+
665665
// Take capture back because click happend outside of control
666666
Mouse.Capture(popupBox, CaptureMode.SubTree);
667667
e.Handled = true;

0 commit comments

Comments
 (0)