Remove more code duplication
This commit is contained in:
parent
4722ca680d
commit
f33a9c1a18
@ -531,24 +531,21 @@ void CGUISTKListBox::draw()
|
|||||||
iconPos.Y += textRect.getHeight() / 2;
|
iconPos.Y += textRect.getHeight() / 2;
|
||||||
iconPos.X += ItemsIconWidth/2;
|
iconPos.X += ItemsIconWidth/2;
|
||||||
|
|
||||||
|
|
||||||
|
EGUI_LISTBOX_COLOR icon_color = EGUI_LBC_ICON;
|
||||||
|
bool highlight=false;
|
||||||
if ( i==Selected && hl )
|
if ( i==Selected && hl )
|
||||||
{
|
{
|
||||||
|
icon_color = EGUI_LBC_ICON_HIGHLIGHT;
|
||||||
|
highlight=true;
|
||||||
|
}
|
||||||
|
|
||||||
IconBank->draw2DSprite(
|
IconBank->draw2DSprite(
|
||||||
(u32)Items[i].m_contents[x].m_icon,
|
(u32)Items[i].m_contents[x].m_icon,
|
||||||
iconPos, &clientClip,
|
iconPos, &clientClip,
|
||||||
hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ?
|
hasItemOverrideColor(i, icon_color) ? getItemOverrideColor(i, icon_color) : getItemDefaultColor(icon_color),
|
||||||
getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
|
(highlight) ? selectTime : 0, (i==Selected) ? (u32)StkTime::getTimeSinceEpoch() : 0, false, true);
|
||||||
selectTime, (u32)StkTime::getTimeSinceEpoch(), false, true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
IconBank->draw2DSprite(
|
|
||||||
(u32)Items[i].m_contents[x].m_icon,
|
|
||||||
iconPos,
|
|
||||||
&clientClip,
|
|
||||||
hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
|
|
||||||
0 , (i==Selected) ? (u32)StkTime::getTimeSinceEpoch() : 0, false, true);
|
|
||||||
}
|
|
||||||
textRect.UpperLeftCorner.X += ItemsIconWidth;
|
textRect.UpperLeftCorner.X += ItemsIconWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user