summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-04-03 20:09:41 +0000
committerfrosch <frosch@openttd.org>2012-04-03 20:09:41 +0000
commit946749fb0187fae0cd349bd8de054d1241f99eb7 (patch)
tree5b82b683f88ea91aac81d94a90427ab02d039aaf /src
parent1e8e911577ec1249cdb0c372608b77b4cf3edafd (diff)
downloadopenttd-946749fb0187fae0cd349bd8de054d1241f99eb7.tar.xz
(svn r24089) -Fix [FS#5136]: Conflicting strategies for resizing the main toolbar and statusbar after resizing the main window.
Diffstat (limited to 'src')
-rw-r--r--src/window.cpp23
-rw-r--r--src/window_func.h2
2 files changed, 14 insertions, 11 deletions
diff --git a/src/window.cpp b/src/window.cpp
index a1a289925..2ea83c9ff 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1753,16 +1753,19 @@ static void EnsureVisibleCaption(Window *w, int nx, int ny)
* @param w Window to resize
* @param delta_x Delta x-size of changed window (positive if larger, etc.)
* @param delta_y Delta y-size of changed window
+ * @param clamp_to_screen Whether to make sure the whole window stays visible
*/
-void ResizeWindow(Window *w, int delta_x, int delta_y)
+void ResizeWindow(Window *w, int delta_x, int delta_y, bool clamp_to_screen)
{
if (delta_x != 0 || delta_y != 0) {
- /* Determine the new right/bottom position. If that is outside of the bounds of
- * the resolution clamp it in such a manner that it stays within the bounds. */
- int new_right = w->left + w->width + delta_x;
- int new_bottom = w->top + w->height + delta_y;
- if (new_right >= (int)_cur_resolution.width) delta_x -= Ceil(new_right - _cur_resolution.width, max(1U, w->nested_root->resize_x));
- if (new_bottom >= (int)_cur_resolution.height) delta_y -= Ceil(new_bottom - _cur_resolution.height, max(1U, w->nested_root->resize_y));
+ if (clamp_to_screen) {
+ /* Determine the new right/bottom position. If that is outside of the bounds of
+ * the resolution clamp it in such a manner that it stays within the bounds. */
+ int new_right = w->left + w->width + delta_x;
+ int new_bottom = w->top + w->height + delta_y;
+ if (new_right >= (int)_cur_resolution.width) delta_x -= Ceil(new_right - _cur_resolution.width, max(1U, w->nested_root->resize_x));
+ if (new_bottom >= (int)_cur_resolution.height) delta_y -= Ceil(new_bottom - _cur_resolution.height, max(1U, w->nested_root->resize_y));
+ }
w->SetDirty();
@@ -2988,7 +2991,7 @@ void RelocateAllWindows(int neww, int newh)
continue;
case WC_MAIN_TOOLBAR:
- ResizeWindow(w, min(neww, *_preferred_toolbar_size) - w->width, 0);
+ ResizeWindow(w, min(neww, *_preferred_toolbar_size) - w->width, 0, false);
top = w->top;
left = PositionMainToolbar(w); // changes toolbar orientation
@@ -3000,14 +3003,14 @@ void RelocateAllWindows(int neww, int newh)
break;
case WC_STATUS_BAR:
- ResizeWindow(w, min(neww, *_preferred_statusbar_size) - w->width, 0);
+ ResizeWindow(w, min(neww, *_preferred_statusbar_size) - w->width, 0, false);
top = newh - w->height;
left = PositionStatusbar(w);
break;
case WC_SEND_NETWORK_MSG:
- ResizeWindow(w, Clamp(neww, 320, 640) - w->width, 0);
+ ResizeWindow(w, Clamp(neww, 320, 640) - w->width, 0, false);
top = newh - w->height - FindWindowById(WC_STATUS_BAR, 0)->height;
left = PositionNetworkChatWindow(w);
break;
diff --git a/src/window_func.h b/src/window_func.h
index d430c0ccd..704885b9a 100644
--- a/src/window_func.h
+++ b/src/window_func.h
@@ -19,7 +19,7 @@ Window *FindWindowById(WindowClass cls, WindowNumber number);
Window *FindWindowByClass(WindowClass cls);
void ChangeWindowOwner(Owner old_owner, Owner new_owner);
-void ResizeWindow(Window *w, int x, int y);
+void ResizeWindow(Window *w, int x, int y, bool clamp_to_screen = true);
int PositionMainToolbar(Window *w);
int PositionStatusbar(Window *w);
int PositionNewsMessage(Window *w);