From aae00f629c6a7ad7f745b51a1ebe16d96f628323 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 5 Feb 2006 18:46:51 +0000 Subject: Change behaviour of checkboxes to more logical. svn-id: r20416 --- gui/ThemeNew.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index b2f0d6d072..b617ae6808 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -587,12 +587,9 @@ void ThemeNew::drawCheckbox(const Common::Rect &r, const Common::String &str, bo int checkBoxSize = checkBox->w; restoreBackground(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h)); - if (state == kStateHighlight && !checked) { - checkBox = surface(!checked ? kCheckboxChecked : kCheckboxEmpty); - drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, 128); - } else { - drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, (state == kStateDisabled) ? 128 : 256); - } + + drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, (state == kStateDisabled) ? 128 : 256); + r2.left += checkBoxSize + 5; _font->drawString(&_screen, str, r2.left, r2.top, r2.width(), getColor(state), Graphics::kTextAlignCenter, 0, false); -- cgit v1.2.3