(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.
--- a/src/transparency_gui.cpp Thu Jul 31 03:13:35 2008 +0000
+++ b/src/transparency_gui.cpp Thu Jul 31 05:47:29 2008 +0000
@@ -55,14 +55,9 @@
}
/* 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);
}
}