From edc2fb7e9ded134647da6603369ffad7fc08d969 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Sun, 20 Mar 2016 03:58:50 +1100
Subject: [PATCH] Default theme: restore backgrounds to sidebar panels

---
 data/themes/_initial.cfg | 75 ++++++++++++++++++++++++++++++++++++++--
 data/themes/default.cfg  | 12 +++----
 2 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/data/themes/_initial.cfg b/data/themes/_initial.cfg
index e915bb95f348..f85bfa0e0f69 100644
--- a/data/themes/_initial.cfg
+++ b/data/themes/_initial.cfg
@@ -32,7 +32,7 @@
     [/main_map_border]
 #enddef
 
-#define STATUS_BOX X1 Y1 X2 Y2 ID REF XANCHOR YANCHOR
+#define STATUS_BOX_BORDERLESS X1 Y1 X2 Y2 ID REF XANCHOR YANCHOR
     [panel]
         id={ID}-box-topleft
         rect="{X1},{Y1},+5,+5"
@@ -94,6 +94,77 @@
     [/panel]
 #enddef
 
+#define STATUS_BOX X1 Y1 X2 Y2 ID REF XANCHOR YANCHOR
+    [panel]
+        id={ID}-box-topleft
+        image=themes/status_box/status_box-border-topleft.png
+        rect="{X1},{Y1},+3,+3"
+        xanchor={XANCHOR}
+        ref={REF}
+        yanchor={YANCHOR}
+    [/panel]
+    [panel]
+        id={ID}-box-top
+        image=themes/status_box/status_box-border-top.png
+        rect="+0,=+0,{X2},+3"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+    [panel]
+        id={ID}-box-topright
+        image=themes/status_box/status_box-border-topright.png
+        rect="+0,=+0,+3,+3"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+
+    [panel]
+        id={ID}-box-left
+        image=themes/status_box/status_box-border-left.png
+        ref={ID}-box-topleft
+        rect="=+0,+0,+3,{Y2}"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+    [panel]
+        id={ID}-box-center
+        image=themes/status_box/status_box-background.png
+        rect="+0,=+0,{X2},{Y2}"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+    [panel]
+        id={ID}-box-right
+        image=themes/status_box/status_box-border-right.png
+        rect="+0,=+0,+3,{Y2}"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+
+    [panel]
+        id={ID}-box-botleft
+        image=themes/status_box/status_box-border-botleft.png
+        ref={ID}-box-left
+        rect="=+0,+0,+3,+3"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+    [panel]
+        id={ID}-box-bottom
+        image=themes/status_box/status_box-border-bottom.png
+        rect="+0,=+0,{X2},+3"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+    [panel]
+        id={ID}-box-botright
+        image=themes/status_box/status_box-border-botright.png
+        rect="+0,=+0,+3,+3"
+        xanchor={XANCHOR}
+        yanchor={YANCHOR}
+    [/panel]
+#enddef
+
 #define REMOVE_STATUS_BOX ID
     [remove]
         id={ID}-box-topleft
@@ -327,7 +398,7 @@
 #enddef
 
 #define COUNTDOWN_THEME
-    {STATUS_BOX +3 =+0 +90 +15 timeout income-box-topright fixed fixed}
+    {STATUS_BOX_BORDERLESS +3 =+0 +90 +15 timeout income-box-topright fixed fixed}
     [label]
         id=time-icon
         #icon=themes/units.png
diff --git a/data/themes/default.cfg b/data/themes/default.cfg
index c1fff7b5c70d..a2a0825dad96 100644
--- a/data/themes/default.cfg
+++ b/data/themes/default.cfg
@@ -102,12 +102,12 @@
             xanchor=fixed
             yanchor=fixed
         [/menu]
-        {STATUS_BOX +5 =+0 +75 +15 turn     actions-menu           fixed fixed}
-        {STATUS_BOX +3 =+0 +75 +15 gold     turn-box-topright      fixed fixed}
-        {STATUS_BOX +3 =+0 +70 +15 villages gold-box-topright      fixed fixed}
-        {STATUS_BOX +3 =+0 +65 +15 units    villages-box-topright  fixed fixed}
-        {STATUS_BOX +3 =+0 +85 +15 upkeep   units-box-topright     fixed fixed}
-        {STATUS_BOX +3 =+0 +85 +15 income   upkeep-box-topright    fixed fixed}
+        {STATUS_BOX_BORDERLESS +5 =+0 +75 +15 turn     actions-menu           fixed fixed}
+        {STATUS_BOX_BORDERLESS +3 =+0 +75 +15 gold     turn-box-topright      fixed fixed}
+        {STATUS_BOX_BORDERLESS +3 =+0 +70 +15 villages gold-box-topright      fixed fixed}
+        {STATUS_BOX_BORDERLESS +3 =+0 +65 +15 units    villages-box-topright  fixed fixed}
+        {STATUS_BOX_BORDERLESS +3 =+0 +85 +15 upkeep   units-box-topright     fixed fixed}
+        {STATUS_BOX_BORDERLESS +3 =+0 +85 +15 income   upkeep-box-topright    fixed fixed}
         {COUNTDOWN_THEME}
         [menu]
             is_context_menu=true