ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make GUI lists just use box, to make them in line with the latest changes that borders should be inside width/height

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-07-06 01:05:08 +00:00
parent 88c1a3b56c
commit 900d495ee9
10 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/gui/addons_screen.stkgui
View File

@ -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>

8
data/gui/options_device.stkgui
View File

@ -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">

6
data/gui/options_input.stkgui
View File

@ -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"/>

4
data/gui/options_players.stkgui
View File

@ -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"

4
data/gui/options_ui.stkgui
View File

@ -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"/>

2
data/gui/skins/Glass.stkskin
View File

@ -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"

2
data/gui/skins/Ocean.stkskin
View File

@ -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"

2
data/gui/skins/Peach.stkskin
View File

@ -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"

5
data/gui/story_mode_lobby.stkgui
View File

@ -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">

8
src/guiengine/skin.cpp
View File

@ -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())
{