From 5e1cd09ea41afe34e1b35b7d694f86a2589d4c68 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 29 Jul 2007 16:43:58 +0000 Subject: (svn r10724) -Fix (r10723): Toolbar spacing was off-by-one --- src/gfx.cpp | 2 +- src/main_gui.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gfx.cpp b/src/gfx.cpp index 5a1d8f00b..ed0077e3f 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -1155,7 +1155,7 @@ bool ChangeResInGame(int width, int height) int new_width = min(_screen.width, 640); Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0); if (w != NULL && new_width != w->width) { - ResizeWindow(w, new_width - w->width, 0); + ResizeWindow(w, new_width - w->width, 0); Window *w2 = FindWindowById(WC_STATUS_BAR, 0); if (w2 != NULL) ResizeWindow(w2, max(new_width, 320) - w2->width, 0); diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 4af8e5d5c..fba6ecb1d 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -1710,16 +1710,16 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e) uint extra_spacing_at[] = { 4, 8, 13, 17, 19, 24, 0 }; for (uint i = 0, x = 0, j = 0; i < 27; i++) { - w->widget[i].left = x; - x += (spacing != 0) ? button_width : (w->width - x) / (27 - i); - w->widget[i].right = x - 1; - if (extra_spacing_at[j] == i) { j++; uint add = spacing / (lengthof(extra_spacing_at) - j); spacing -= add; x += add; } + + w->widget[i].left = x; + x += (spacing != 0) ? button_width : (w->width - x) / (27 - i); + w->widget[i].right = x - 1; } } break; -- cgit v1.2.3-70-g09d2