From b7e64bb5a6f79560d6e7b2afb05a3b1684f237b8 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Thu, 31 Jul 2008 05:47:29 +0000 Subject: (svn r13890) -Codechange: Simplify drawing of invisibilty buttons in the transparency gui -- the real widgets above already have coordinates so there is no need to hardcode them again. As an added bonus the invisibility buttons now line up properly. --- src/transparency_gui.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/transparency_gui.cpp') diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index 8b6d234db..8d5d594a3 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -55,14 +55,9 @@ public: } /* Do not draw button for invisible loading indicators */ - for (uint i = 0; i < 8; i++) { - if (i < TTW_WIDGET_BRIDGES - TTW_WIDGET_SIGNS) { - DrawFrameRect(i * 22, 38, i * 22 + 19, 46, COLOUR_PALE_GREEN, HasBit(_invisibility_opt, i) ? FR_LOWERED : FR_NONE); - } else if (i == TTW_WIDGET_BRIDGES - TTW_WIDGET_SIGNS) { - DrawFrameRect(i * 22, 38, i * 22 + 41, 46, COLOUR_PALE_GREEN, HasBit(_invisibility_opt, i) ? FR_LOWERED : FR_NONE); - } else { // i > TTW_WIDGET_BRIDGES - TTW_WIDGET_SIGNS - DrawFrameRect((i + 1) * 22, 38, (i + 1) * 22 + 19, 46, COLOUR_PALE_GREEN, HasBit(_invisibility_opt, i) ? FR_LOWERED : FR_NONE); - } + for (uint i = TTW_WIDGET_SIGNS; i <= TTW_WIDGET_CATENARY; i++) { + const Widget *wi = &this->widget[i]; + DrawFrameRect(wi->left + 1, 38, wi->right - 1, 46, COLOUR_PALE_GREEN, HasBit(_invisibility_opt, i - TTW_WIDGET_SIGNS) ? FR_LOWERED : FR_NONE); } } -- cgit v1.2.3-54-g00ecf