Skip to content

Commit 70bee38

Browse files
authored
Horizontal list bot scrollbar now properly applies minimalist style (#2327)
* Horizontal list bot scrollbar now properly applies minimalist style * Fixing temperamental test
1 parent a9086f0 commit 70bee38

File tree

3 files changed

+46
-2
lines changed

3 files changed

+46
-2
lines changed

MaterialDesignThemes.UITests/WPF/DialogHost/DialogHostTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public async Task ClosingDialogWithIsOpenProperty_ShouldRaiseDialogClosingEvent(
5858
IVisualElement closeButton = await dialogHost.GetElement("CloseButton");
5959
IVisualElement resultTextBlock = await dialogHost.GetElement("ResultTextBlock");
6060

61-
6261
await showButton.Click();
6362
await Wait.For(async () => await closeButton.GetIsVisible());
63+
await Task.Delay(300);
6464
await closeButton.Click();
6565

6666
await Wait.For(async () => Assert.Equal("1", await resultTextBlock.GetText()));

MaterialDesignThemes.UITests/WPF/ListBox/ListBoxTests.cs

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.ComponentModel;
1+
using System;
2+
using System.ComponentModel;
23
using System.Threading.Tasks;
34
using System.Windows.Controls.Primitives;
45
using System.Windows.Media;
@@ -86,5 +87,47 @@ public async Task OnClickChoiceChipListBox_ChangesSelectedItem(string listBoxSty
8687

8788
recorder.Success();
8889
}
90+
91+
[Fact]
92+
public async Task ScrollBarAssist_ButtonsVisibility_HidesButtonsOnMinimalistStyle()
93+
{
94+
await using var recorder = new TestRecorder(App);
95+
96+
string xaml = @"<ListBox Height=""300"" Width=""300""
97+
materialDesign:ScrollBarAssist.ButtonsVisibility=""Collapsed""
98+
ScrollViewer.HorizontalScrollBarVisibility=""Visible""
99+
ScrollViewer.VerticalScrollBarVisibility=""Visible"">
100+
<ListBox.Resources>
101+
<Style BasedOn=""{StaticResource MaterialDesignScrollBarMinimal}"" TargetType=""{x:Type ScrollBar}"" />
102+
</ListBox.Resources>
103+
";
104+
for(int i = 0; i < 50; i++)
105+
{
106+
xaml += $" <ListBoxItem>This is a pretty long meaningless text just to make horizontal scrollbar visibile</ListBoxItem>{Environment.NewLine}";
107+
}
108+
xaml += "</ListBox>";
109+
110+
IVisualElement listBox = await LoadXaml(xaml);
111+
IVisualElement verticalScrollBar = await listBox.GetElement("PART_VerticalScrollBar");
112+
IVisualElement horizontalScrollBar = await listBox.GetElement("PART_HorizontalScrollBar");
113+
114+
Assert.Equal(17, await verticalScrollBar.GetActualWidth());
115+
var verticalThumb = await verticalScrollBar.GetElement("/Thumb~border");
116+
Assert.Equal(10, await verticalThumb.GetActualWidth());
117+
var upButton = await verticalScrollBar.GetElement("PART_LineUpButton");
118+
Assert.False(await upButton.GetIsVisible());
119+
var downButton = await verticalScrollBar.GetElement("PART_LineDownButton");
120+
Assert.False(await downButton.GetIsVisible());
121+
122+
Assert.Equal(17, await horizontalScrollBar.GetActualHeight());
123+
var horizontalThumb = await horizontalScrollBar.GetElement("/Thumb~border");
124+
Assert.Equal(10, await horizontalThumb.GetActualHeight());
125+
var leftButton = await horizontalScrollBar.GetElement("PART_LineLeftButton");
126+
Assert.False(await upButton.GetIsVisible());
127+
var rightButton = await horizontalScrollBar.GetElement("PART_LineRightButton");
128+
Assert.False(await downButton.GetIsVisible());
129+
130+
recorder.Success();
131+
}
89132
}
90133
}

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ScrollBar.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,5 +262,6 @@
262262
<Setter Property="wpf:ScrollBarAssist.ThumbCornerRadius" Value="0"/>
263263
<Setter Property="wpf:ScrollBarAssist.ButtonsVisibility" Value="Collapsed"/>
264264
<Setter Property="wpf:ScrollBarAssist.ThumbWidth" Value="10"/>
265+
<Setter Property="wpf:ScrollBarAssist.ThumbHeight" Value="10"/>
265266
</Style>
266267
</ResourceDictionary>

0 commit comments

Comments
 (0)