diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-23 22:20:23 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-23 22:20:23 +0000 |
| commit | 2347c418401386adba8ffc0906b4e9d75c91e95f (patch) | |
| tree | 8e4bea69fb428c8d1b1e93c18564bde73ce0881e /src | |
| parent | c9e2e22bc00ae4b3aefa7a46f9170b5dde4378fe (diff) | |
| download | openttd-2347c418401386adba8ffc0906b4e9d75c91e95f.tar.xz | |
(svn r15833) -Fix: alignment of up/down arrows and closebox when in RTL 'view'
Diffstat (limited to 'src')
| -rw-r--r-- | src/widget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index c03a02b27..00a732e15 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -319,11 +319,11 @@ void Window::DrawWidgets() const /* draw up/down buttons */ clicked = ((this->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_UP); DrawFrameRect(r.left, r.top, r.right, r.top + 9, wi->colour, (clicked) ? FR_LOWERED : FR_NONE); - DrawString(r.left + 2 + clicked, r.right, r.top + clicked, UPARROW, TC_BLACK); + DrawString(r.left + clicked, r.right + clicked, r.top + clicked, UPARROW, TC_BLACK, SA_CENTER); clicked = (((this->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_DOWN)); DrawFrameRect(r.left, r.bottom - 9, r.right, r.bottom, wi->colour, (clicked) ? FR_LOWERED : FR_NONE); - DrawString(r.left + 2 + clicked, r.right, r.bottom - 9 + clicked, DOWNARROW, TC_BLACK); + DrawString(r.left + clicked, r.right + clicked, r.bottom - 9 + clicked, DOWNARROW, TC_BLACK, SA_CENTER); int c1 = _colour_gradient[wi->colour & 0xF][3]; int c2 = _colour_gradient[wi->colour & 0xF][7]; @@ -350,11 +350,11 @@ void Window::DrawWidgets() const /* draw up/down buttons */ clicked = ((this->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_UP | WF_SCROLL2)); DrawFrameRect(r.left, r.top, r.right, r.top + 9, wi->colour, (clicked) ? FR_LOWERED : FR_NONE); - DrawString(r.left + 2 + clicked, r.right, r.top + clicked, UPARROW, TC_BLACK); + DrawString(r.left + clicked, r.right + clicked, r.top + clicked, UPARROW, TC_BLACK, SA_CENTER); clicked = ((this->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_DOWN | WF_SCROLL2)); DrawFrameRect(r.left, r.bottom - 9, r.right, r.bottom, wi->colour, (clicked) ? FR_LOWERED : FR_NONE); - DrawString(r.left + 2 + clicked, r.right, r.bottom - 9 + clicked, DOWNARROW, TC_BLACK); + DrawString(r.left + clicked, r.right + clicked, r.bottom - 9 + clicked, DOWNARROW, TC_BLACK, SA_CENTER); int c1 = _colour_gradient[wi->colour & 0xF][3]; int c2 = _colour_gradient[wi->colour & 0xF][7]; @@ -477,7 +477,7 @@ void Window::DrawWidgets() const assert(r.right - r.left == 10); // To ensure the same sizes are used everywhere DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->colour, FR_NONE); - DrawString(r.left + 2, r.right, r.top + 2, str, TC_FROMSTRING); + DrawString(r.left, r.right, r.top + 2, str, TC_FROMSTRING, SA_CENTER); break; } @@ -500,12 +500,12 @@ void Window::DrawWidgets() const if (_dynlang.text_dir == TD_LTR) { DrawFrameRect(r.left, r.top, r.right - 12, r.bottom, wi->colour, FR_NONE); DrawFrameRect(r.right - 11, r.top, r.right, r.bottom, wi->colour, clicked ? FR_LOWERED : FR_NONE); - DrawString(r.right - (clicked ? 8 : 9), r.right, r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK); + DrawString(r.right - (clicked ? 10 : 11), r.right, r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK, SA_CENTER); if (str != STR_NULL) DrawString(r.left + 2, r.right - 14, r.top + 1, str, TC_BLACK); } else { DrawFrameRect(r.left + 12, r.top, r.right, r.bottom, wi->colour, FR_NONE); DrawFrameRect(r.left, r.top, r.left + 11, r.bottom, wi->colour, clicked ? FR_LOWERED : FR_NONE); - DrawString(r.left + 1, r.left + (clicked ? 10 : 11), r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK); + DrawString(r.left + clicked, r.left + 11, r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK, SA_CENTER); if (str != STR_NULL) DrawString(r.left + 14, r.right - 2, r.top + 1, str, TC_BLACK); } break; |