gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24089) -Fix [FS#5136]: Conflicting strategies for resizing the main toolbar and statusbar after resizing the main window.

Browse Source
This commit is contained in:
frosch 2012-04-03 20:09:41 +00:00
parent 1e8e911577
commit 946749fb01
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/window.cpp
View File

@ -1753,16 +1753,19 @@ static void EnsureVisibleCaption(Window *w, int nx, int ny)
* @param w Window to resize * @param w Window to resize
* @param delta_x Delta x-size of changed window (positive if larger, etc.) * @param delta_x Delta x-size of changed window (positive if larger, etc.)
* @param delta_y Delta y-size of changed window * @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) { if (delta_x != 0 || delta_y != 0) {
/* Determine the new right/bottom position. If that is outside of the bounds of if (clamp_to_screen) {
* the resolution clamp it in such a manner that it stays within the bounds. */ /* Determine the new right/bottom position. If that is outside of the bounds of
int new_right = w->left + w->width + delta_x; * the resolution clamp it in such a manner that it stays within the bounds. */
int new_bottom = w->top + w->height + delta_y; int new_right = w->left + w->width + delta_x;
if (new_right >= (int)_cur_resolution.width) delta_x -= Ceil(new_right - _cur_resolution.width, max(1U, w->nested_root->resize_x)); int new_bottom = w->top + w->height + delta_y;
if (new_bottom >= (int)_cur_resolution.height) delta_y -= Ceil(new_bottom - _cur_resolution.height, max(1U, w->nested_root->resize_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(); w->SetDirty();
@ -2988,7 +2991,7 @@ void RelocateAllWindows(int neww, int newh)
continue; continue;
case WC_MAIN_TOOLBAR: 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; top = w->top;
left = PositionMainToolbar(w); // changes toolbar orientation left = PositionMainToolbar(w); // changes toolbar orientation
@ -3000,14 +3003,14 @@ void RelocateAllWindows(int neww, int newh)
break; break;
case WC_STATUS_BAR: 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; top = newh - w->height;
left = PositionStatusbar(w); left = PositionStatusbar(w);
break; break;
case WC_SEND_NETWORK_MSG: 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; top = newh - w->height - FindWindowById(WC_STATUS_BAR, 0)->height;
left = PositionNetworkChatWindow(w); left = PositionNetworkChatWindow(w);
break; break;

2
src/window_func.h
View File

@ -19,7 +19,7 @@ Window *FindWindowById(WindowClass cls, WindowNumber number);
Window *FindWindowByClass(WindowClass cls); Window *FindWindowByClass(WindowClass cls);
void ChangeWindowOwner(Owner old_owner, Owner new_owner); 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 PositionMainToolbar(Window *w);
int PositionStatusbar(Window *w); int PositionStatusbar(Window *w);
int PositionNewsMessage(Window *w); int PositionNewsMessage(Window *w);