Commit eff82803 authored by hybrid's avatar hybrid

The checkbox color seems to have changed. Please check if this was intended!

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3488 dfc29bdd-3216-0410-991c-e03cc46cb475
parent af86f539
...@@ -127,10 +127,10 @@ void CGUICheckBox::draw() ...@@ -127,10 +127,10 @@ void CGUICheckBox::draw()
return; return;
IGUISkin* skin = Environment->getSkin(); IGUISkin* skin = Environment->getSkin();
if (skin)
core::rect<s32> rect = AbsoluteRect; {
const core::rect<s32> rect = AbsoluteRect;
s32 height = skin->getSize(EGDS_CHECK_BOX_WIDTH); const s32 height = skin->getSize(EGDS_CHECK_BOX_WIDTH);
core::rect<s32> checkRect(AbsoluteRect.UpperLeftCorner.X, core::rect<s32> checkRect(AbsoluteRect.UpperLeftCorner.X,
((AbsoluteRect.getHeight() - height) / 2) + AbsoluteRect.UpperLeftCorner.Y, ((AbsoluteRect.getHeight() - height) / 2) + AbsoluteRect.UpperLeftCorner.Y,
...@@ -145,10 +145,11 @@ void CGUICheckBox::draw() ...@@ -145,10 +145,11 @@ void CGUICheckBox::draw()
skin->draw3DSunkenPane(this, skin->getColor(col), skin->draw3DSunkenPane(this, skin->getColor(col),
false, true, checkRect, &AbsoluteClippingRect); false, true, checkRect, &AbsoluteClippingRect);
if (Checked && Environment->getSkin()) if (Checked)
Environment->getSkin()->drawIcon(this, EGDI_CHECK_BOX_CHECKED, checkRect.getCenter(), {
skin->drawIcon(this, EGDI_CHECK_BOX_CHECKED, checkRect.getCenter(),
checkTime, os::Timer::getTime(), false, &AbsoluteClippingRect); checkTime, os::Timer::getTime(), false, &AbsoluteClippingRect);
}
if (Text.size()) if (Text.size())
{ {
checkRect = AbsoluteRect; checkRect = AbsoluteRect;
...@@ -156,10 +157,12 @@ void CGUICheckBox::draw() ...@@ -156,10 +157,12 @@ void CGUICheckBox::draw()
IGUIFont* font = skin->getFont(); IGUIFont* font = skin->getFont();
if (font) if (font)
{
font->draw(Text.c_str(), checkRect, font->draw(Text.c_str(), checkRect,
skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT), false, true, &AbsoluteClippingRect); skin->getColor(isEnabled() ? EGDC_BUTTON_TEXT : EGDC_GRAY_TEXT), false, true, &AbsoluteClippingRect);
} }
}
}
IGUIElement::draw(); IGUIElement::draw();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment