diff --git a/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs b/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs index 818f315eac..5ab638ac4e 100644 --- a/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs +++ b/tests/Avalonia.RenderTests/Controls/CommandBarTests.cs @@ -25,6 +25,16 @@ namespace Avalonia.Direct2D1.RenderTests.Controls Setters = { new Setter(TextBlock.FontFamilyProperty, TestFontFamily) } }; + private static Style OverflowLabelRectStyle => new Style(x => x.OfType().Template().Name("PART_Label")) + { + Setters = + { + new Setter(TextBlock.WidthProperty, 50d), + new Setter(TextBlock.HeightProperty, 10d), + new Setter(TextBlock.BackgroundProperty, Brushes.Black), + } + }; + [Fact] public async Task CommandBar_Default_PrimaryCommands() { @@ -156,8 +166,7 @@ namespace Avalonia.Direct2D1.RenderTests.Controls Padding = new Thickness(4), Child = new CommandBarButton { - Label = "Open", - FontFamily = TestFontFamily, + Label = string.Empty, IsCompact = true, IsInOverflow = true, LabelPosition = CommandBarDefaultLabelPosition.Right, @@ -175,8 +184,10 @@ namespace Avalonia.Direct2D1.RenderTests.Controls target.Styles.Add(new SimpleTheme()); target.Styles.Add(FontStyle); + target.Styles.Add(OverflowLabelRectStyle); await RenderToFile(target); CompareImages(skipImmediate: true); } + } } diff --git a/tests/TestFiles/Skia/Controls/CommandBar/CommandBarButton_Overflow_ShowsLabel_WhenCompact.expected.png b/tests/TestFiles/Skia/Controls/CommandBar/CommandBarButton_Overflow_ShowsLabel_WhenCompact.expected.png index 3ccc7292da..f0b82df092 100644 Binary files a/tests/TestFiles/Skia/Controls/CommandBar/CommandBarButton_Overflow_ShowsLabel_WhenCompact.expected.png and b/tests/TestFiles/Skia/Controls/CommandBar/CommandBarButton_Overflow_ShowsLabel_WhenCompact.expected.png differ