summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2008-08-03 17:35:08 +0000
committerpeter1138 <peter1138@openttd.org>2008-08-03 17:35:08 +0000
commitd5c80dfb8eaae07824cdb372214f934c074c0360 (patch)
treea8259257d2fec8e54da382e9da4625c42cfb0b9e
parentfe058e2ec22f630d34ccde20108850a12d88ea4a (diff)
downloadopenttd-d5c80dfb8eaae07824cdb372214f934c074c0360.tar.xz
(svn r13977) -Codechange: Let ResizeWindowForWidget() handle hidden (zero height or zero width) widgets.
-rw-r--r--src/widget.cpp11
-rw-r--r--src/window_gui.h2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/widget.cpp b/src/widget.cpp
index 04540d64a..aa93317d2 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -590,18 +590,23 @@ void ResizeButtons(Window *w, byte left, byte right)
}
/** Resize a widget and shuffle other widgets around to fit. */
-void ResizeWindowForWidget(Window *w, int widget, int delta_x, int delta_y)
+void ResizeWindowForWidget(Window *w, uint widget, int delta_x, int delta_y)
{
int right = w->widget[widget].right;
int bottom = w->widget[widget].bottom;
for (uint i = 0; i < w->widget_count; i++) {
- if (w->widget[i].left >= right) w->widget[i].left += delta_x;
+ if (w->widget[i].left >= right && i != widget) w->widget[i].left += delta_x;
if (w->widget[i].right >= right) w->widget[i].right += delta_x;
- if (w->widget[i].top >= bottom) w->widget[i].top += delta_y;
+ if (w->widget[i].top >= bottom && i != widget) w->widget[i].top += delta_y;
if (w->widget[i].bottom >= bottom) w->widget[i].bottom += delta_y;
}
+ /* A hidden widget has bottom == top or right == left, we need to make it
+ * one less to fit in its new gap. */
+ if (right == w->widget[widget].left) w->widget[widget].right--;
+ if (bottom == w->widget[widget].top) w->widget[widget].bottom--;
+
w->width += delta_x;
w->height += delta_y;
w->resize.width += delta_x;
diff --git a/src/window_gui.h b/src/window_gui.h
index 7d0a1403c..b615778c2 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -573,7 +573,7 @@ void ScrollbarClickHandler(Window *w, const Widget *wi, int x, int y);
void ResizeButtons(Window *w, byte left, byte right);
-void ResizeWindowForWidget(Window *w, int widget, int delta_x, int delta_y);
+void ResizeWindowForWidget(Window *w, uint widget, int delta_x, int delta_y);
void SetVScrollCount(Window *w, int num);
void SetVScroll2Count(Window *w, int num);