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

Fixed weird list rendering

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8933 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-06-15 01:48:35 +00:00
parent 2e1da404d0
commit b833ce158b
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,11 +157,6 @@ when the border that intersect at this corner are enabled.
left_border="0" right_border="0" top_border="0" bottom_border="0" left_border="0" right_border="0" top_border="0" bottom_border="0"
hborder_out_portion="0.0" vborder_out_portion="0.0" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<element type="listitem" state="down" image="glass/glassbutton.png"
left_border="80" right_border="80" top_border="0" bottom_border="36"
hborder_out_portion="1.0" vborder_out_portion="1.0"
areas="body" />
<!-- Scrollbars. Background and thumb have no state (always neutral state). <!-- Scrollbars. Background and thumb have no state (always neutral state).
The buttons are the top and bottom arrows. Image must be top arrow, will The buttons are the top and bottom arrows. Image must be top arrow, will
be mirrorred for bottom. Buttons can be in neutral or down state. be mirrorred for bottom. Buttons can be in neutral or down state.

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

@ -156,10 +156,6 @@ when the border that intersect at this corner are enabled.
left_border="0" right_border="0" top_border="0" bottom_border="0" left_border="0" right_border="0" top_border="0" bottom_border="0"
hborder_out_portion="0.0" vborder_out_portion="0.0" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<element type="listitem" state="down" image="ocean/glassbutton.png"
left_border="80" right_border="80" top_border="0" bottom_border="36"
hborder_out_portion="1.0" vborder_out_portion="1.0"
areas="body" />
<!-- Scrollbars. Background and thumb have no state (always neutral state). <!-- Scrollbars. Background and thumb have no state (always neutral state).
The buttons are the top and bottom arrows. Image must be top arrow, will The buttons are the top and bottom arrows. Image must be top arrow, will

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

@ -156,11 +156,6 @@ when the border that intersect at this corner are enabled.
left_border="0" right_border="0" top_border="0" bottom_border="0" left_border="0" right_border="0" top_border="0" bottom_border="0"
hborder_out_portion="0.0" vborder_out_portion="0.0" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<element type="listitem" state="down" image="peach/glassbutton.png"
left_border="80" right_border="80" top_border="0" bottom_border="36"
hborder_out_portion="1.0" vborder_out_portion="1.0"
areas="body" />
<!-- Scrollbars. Background and thumb have no state (always neutral state). <!-- Scrollbars. Background and thumb have no state (always neutral state).
The buttons are the top and bottom arrows. Image must be top arrow, will The buttons are the top and bottom arrows. Image must be top arrow, will
be mirrorred for bottom. Buttons can be in neutral or down state. be mirrorred for bottom. Buttons can be in neutral or down state.

9
src/guiengine/skin.cpp
View File

@ -621,6 +621,7 @@ X##_yflip.LowerRightCorner.Y = w->m_skin_dest_y + (w->m_skin_dest_y2 - w->m_skin
*/ */
void Skin::drawButton(Widget* w, const core::rect< s32 > &rect, const bool pressed, const bool focused) void Skin::drawButton(Widget* w, const core::rect< s32 > &rect, const bool pressed, const bool focused)
{ {
// if within an appearing dialog, grow // if within an appearing dialog, grow
if (m_dialog && m_dialog_size < 1.0f && w->m_parent != NULL && w->m_parent->getType() == gui::EGUIET_WINDOW) if (m_dialog && m_dialog_size < 1.0f && w->m_parent != NULL && w->m_parent->getType() == gui::EGUIET_WINDOW)
{ {
@ -1268,17 +1269,9 @@ void Skin::drawListSelection(const core::rect< s32 > &rect, Widget* widget, bool
ListWidget* list = dynamic_cast<ListWidget*>(widget); ListWidget* list = dynamic_cast<ListWidget*>(widget);
assert(list != NULL); assert(list != NULL);
if (focused)
{
drawBoxFromStretchableTexture(&list->m_selection_skin_info, rect, drawBoxFromStretchableTexture(&list->m_selection_skin_info, rect,
SkinConfig::m_render_params["listitem::focused"], false, clip); SkinConfig::m_render_params["listitem::focused"], false, clip);
} }
else
{
drawBoxFromStretchableTexture(&list->m_selection_skin_info, rect,
SkinConfig::m_render_params["listitem::down"], false, clip);
}
}
void Skin::drawListHeader(const irr::core::rect< irr::s32 > &rect, Widget* widget) void Skin::drawListHeader(const irr::core::rect< irr::s32 > &rect, Widget* widget)
{ {