cpp/openttd-patchpack/source Changeset - r7361:4526784d7450

Changeset - r7361:4526784d7450

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

peter1138 - 17 years ago 2007-07-29 16:43:58
peter1138@openttd.org

(svn r10724) -Fix (r10723): Toolbar spacing was off-by-one

2 files changed with 5 insertions and 5 deletions:

src/gfx.cpp

src/main_gui.cpp

0 comments (0 inline, 0 general)

src/gfx.cpp

➞

Show inline comments

@@ @@ -1155,7 +1155,7 @@ bool ChangeResInGame(int width, int heig @@
 	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);

src/main_gui.cpp

➞

Show inline comments

@@ @@ -1710,16 +1710,16 @@ static void MainToolbarWndProc(Window *w @@
 		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;

0 comments (0 inline, 0 general)