From 900d495ee96e157bbb0af2feb62a770481ace716 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 6 Jul 2013 01:05:08 +0000
Subject: [PATCH] Make GUI lists just use box, to make them in line with the
 latest changes that borders should be inside width/height

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/addons_screen.stkgui    | 13 ++++++-------
 data/gui/options_device.stkgui   |  8 +++++---
 data/gui/options_input.stkgui    |  6 +++++-
 data/gui/options_players.stkgui  |  4 +++-
 data/gui/options_ui.stkgui       |  4 +++-
 data/gui/skins/Glass.stkskin     |  2 +-
 data/gui/skins/Ocean.stkskin     |  2 +-
 data/gui/skins/Peach.stkskin     |  2 +-
 data/gui/story_mode_lobby.stkgui |  5 ++++-
 src/guiengine/skin.cpp           |  8 +++++---
 10 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/data/gui/addons_screen.stkgui b/data/gui/addons_screen.stkgui
index be2f51e87..f577a575e 100644
--- a/data/gui/addons_screen.stkgui
+++ b/data/gui/addons_screen.stkgui
@@ -20,7 +20,7 @@
         </div>
     </box>
     
-    <spacer height="25" width="10"/>
+    <spacer height="15" width="10"/>
 
     <tabs id="category" height="10%" max_height="110" width="90%" align="center">
         <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
@@ -30,12 +30,11 @@
         <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
                 I18N="Section in the addons menu" text="Arenas"/>
     </tabs>
-    <spacer height="5" width="10"/>
-    
-    <list id="list_addons" proportion="1" width="97%" align="center"/>
-        
-    <spacer width="1" height="8" /> 
-        
+
+    <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+        <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
+    </box>
+       
 </div>
 
 </stkgui>
diff --git a/data/gui/options_device.stkgui b/data/gui/options_device.stkgui
index c7b662bc6..0492c72c5 100644
--- a/data/gui/options_device.stkgui
+++ b/data/gui/options_device.stkgui
@@ -22,9 +22,11 @@
         <spacer height="16" width="10"/>
         
         <!-- List of key bindings -->
-        <list id="actions" proportion="8" width="75%" align="center"/>
-         
-         <!-- Bottom buttons -->
+        <box proportion="8" width="75%" align="center" layout="vertical-row" padding="8">
+            <list id="actions" x="0" y="0" width="100%" height="100%"/>
+        </box>
+        
+        <!-- Bottom buttons -->
 
         <spacer width="50" height="20" /> 
         <div proportion="2" width="100%"  layout="horizontal-row">
diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui
index 1fd60722c..e4160b3aa 100644
--- a/data/gui/options_input.stkgui
+++ b/data/gui/options_input.stkgui
@@ -21,7 +21,11 @@
             text_align="center" />
 
         <spacer width="5" height="20"/>
-        <list id="devices" proportion="5" width="75%" align="center"/>
+        
+        <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
+            <list id="devices" x="0" y="0" width="100%" height="100%"/>
+        </box>
+        
         <spacer width="50" height="25" /> 
  
         <button id="add_device" I18N="In the input configuration screen"  text="Add a device" align="center"/>
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui
index 9255f69ac..10c26320f 100644
--- a/data/gui/options_players.stkgui
+++ b/data/gui/options_players.stkgui
@@ -34,7 +34,9 @@
             text_align="center" />
 
         <spacer width="5" height="20"/>
-        <list id="players" proportion="5" width="75%" align="center"/>
+        <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
+            <list id="players" x="0" y="0" width="100%" height="100%"/>
+        </box>
         <spacer width="20" height="25"/>
         
         <button id="addplayer" x="20"
diff --git a/data/gui/options_ui.stkgui b/data/gui/options_ui.stkgui
index 5cc853979..8f96d6377 100644
--- a/data/gui/options_ui.stkgui
+++ b/data/gui/options_ui.stkgui
@@ -49,7 +49,9 @@
         
         <!-- ************ LANGUAGE CHOICE ************ -->
         
-        <list id="language" proportion="1" width="75%" align="center"/>
+        <box proportion="1" width="75%" align="center" layout="vertical-row" padding="8">
+            <list id="language" x="0" y="0" width="100%" height="100%"/>
+        </box>
         
         <spacer height="18" width="4"/>
 
diff --git a/data/gui/skins/Glass.stkskin b/data/gui/skins/Glass.stkskin
index ec3b080be..048c60a7f 100644
--- a/data/gui/skins/Glass.stkskin
+++ b/data/gui/skins/Glass.stkskin
@@ -152,7 +152,7 @@ when the border that intersect at this corner are enabled.
 <!-- Lists are always in neutral state for now -->
 <element type="list" image="glass/glass_section.png"
     left_border="15" right_border="15" top_border="15" bottom_border="15"
-    hborder_out_portion="0.5" vborder_out_portion="1.0" />
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
     
 <element type="listitem" state="focused" image="glass/glasssgauge_fill.png"
     left_border="0" right_border="0" top_border="0" bottom_border="0"
diff --git a/data/gui/skins/Ocean.stkskin b/data/gui/skins/Ocean.stkskin
index 54327a769..6f7f04fed 100644
--- a/data/gui/skins/Ocean.stkskin
+++ b/data/gui/skins/Ocean.stkskin
@@ -151,7 +151,7 @@ when the border that intersect at this corner are enabled.
 <!-- Lists are always in neutral state for now -->
 <element type="list" image="ocean/glass_section.png"
     left_border="15" right_border="15" top_border="7" bottom_border="7"
-    hborder_out_portion="0.5" vborder_out_portion="1.0" />
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
     
 <element type="listitem" state="focused" image="ocean/select.png"
     left_border="0" right_border="0" top_border="0" bottom_border="0"
diff --git a/data/gui/skins/Peach.stkskin b/data/gui/skins/Peach.stkskin
index 671a45a3d..4ca051e39 100644
--- a/data/gui/skins/Peach.stkskin
+++ b/data/gui/skins/Peach.stkskin
@@ -151,7 +151,7 @@ when the border that intersect at this corner are enabled.
 <!-- Lists are always in neutral state for now -->
 <element type="list" image="peach/glass_section.png"
     left_border="15" right_border="15" top_border="7" bottom_border="7"
-    hborder_out_portion="0.5" vborder_out_portion="1.0" />
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
     
 <element type="listitem" state="focused" image="peach/select.png"
     left_border="0" right_border="0" top_border="0" bottom_border="0"
diff --git a/data/gui/story_mode_lobby.stkgui b/data/gui/story_mode_lobby.stkgui
index 13bd58049..4d5ae117c 100644
--- a/data/gui/story_mode_lobby.stkgui
+++ b/data/gui/story_mode_lobby.stkgui
@@ -5,7 +5,10 @@
     <header text_align="center" width="80%" align="center" text="Select a Player"/>
     <spacer height="15" width="10"/>
 
-    <list id="gameslots" proportion="5" width="75%" align="center"/>
+    <box proportion="6" width="75%" align="center" layout="vertical-row" padding="8">
+        <list id="gameslots" x="0" y="0" width="100%" height="100%"/>
+    </box>
+    
     <spacer width="20" height="25"/>
     
     <div layout="horizontal-row" align="center" width="70%" height="fit">
diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 388db1c8d..2fc79572f 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1521,9 +1521,9 @@ void Skin::drawCheckBox(const core::recti &rect, Widget* widget, bool focused)
  */
 void Skin::drawList(const core::recti &rect, Widget* widget, bool focused)
 {
-    drawBoxFromStretchableTexture(widget, rect,
-                                  SkinConfig::m_render_params["list::neutral"],
-                                  widget->m_deactivated, NULL);
+    //drawBoxFromStretchableTexture(widget, rect,
+    //                              SkinConfig::m_render_params["list::neutral"],
+    //                              widget->m_deactivated, NULL);
 
 }   // drawList
 
@@ -1610,6 +1610,8 @@ void Skin::renderSections(PtrVector<Widget>* within_vector)
                     drawBoxFromStretchableTexture(&widget, rect,
                               SkinConfig::m_render_params["section::neutral"]);
                 }
+                
+                renderSections( &widget.m_children );
             }
             else if (widget.isBottomBar())
             {