mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-01-20 02:42:42 +01:00
(svn r12869) [0.6] -Backport from trunk r12714, r12708, r12674, r12577, r12553:
- Fix: Do not move windows below the toolbar on resizes unless they would go behind the toolbar [FS#1904] (r12714) - Fix: Increase default sound buffer size only for Vista [FS#1914] (r12708) - Fix: Colour remaps on station sprites only worked for company colours [FS#1902] (r12674) - Fix: The convert signal button disallowed signal dragging when the signal GUI was closed (r12577) - Fix: Redraw the signal GUI when the signal drag density changes in the patch settings and vice versa (r12553)
This commit is contained in:
@@ -2185,7 +2185,7 @@ void RelocateAllWindows(int neww, int newh)
|
||||
|
||||
const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
|
||||
if (wt != NULL) {
|
||||
if (top < wt->height) top = wt->height;
|
||||
if (top < wt->height && wt->left < (w->left + w->width) && (wt->left + wt->width) > w->left) top = wt->height;
|
||||
if (top >= newh) top = newh - 1;
|
||||
} else {
|
||||
if (top < 0) top = 0;
|
||||
|
||||
Reference in New Issue
Block a user