From 7cbb123fe262d14b798eb8a68bf446afc74aa694 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Tue, 28 Jan 2020 18:35:23 +0100
Subject: [PATCH] Merge pull request #3481 from
 AvaloniaUI/fixes/3431-itemscontrol-bg

Respect background/border in ItemsControl.
---
 src/Avalonia.Themes.Default/ItemsControl.xaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Themes.Default/ItemsControl.xaml b/src/Avalonia.Themes.Default/ItemsControl.xaml
index f3def542fc..8bb0fc297c 100644
--- a/src/Avalonia.Themes.Default/ItemsControl.xaml
+++ b/src/Avalonia.Themes.Default/ItemsControl.xaml
@@ -1,10 +1,15 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="ItemsControl">
   <Setter Property="Template">
     <ControlTemplate>
-      <ItemsPresenter Name="PART_ItemsPresenter"
-                      Items="{TemplateBinding Items}"
-                      ItemsPanel="{TemplateBinding ItemsPanel}"
-                      ItemTemplate="{TemplateBinding ItemTemplate}"/>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Padding="{TemplateBinding Padding}">
+        <ItemsPresenter Name="PART_ItemsPresenter"
+                        Items="{TemplateBinding Items}"
+                        ItemsPanel="{TemplateBinding ItemsPanel}"
+                        ItemTemplate="{TemplateBinding ItemTemplate}"/>
+      </Border>
     </ControlTemplate>
   </Setter>
 </Style>