mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-01-28 06:34:33 +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:
@@ -583,7 +583,7 @@ static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
|
||||
|
||||
case WE_PLACE_DRAG: {
|
||||
/* no dragging if you have pressed the convert button */
|
||||
if (_convert_signal_button && w->IsWidgetLowered(RTW_BUILD_SIGNALS)) return;
|
||||
if (FindWindowById(WC_BUILD_SIGNAL, 0) != NULL && _convert_signal_button && w->IsWidgetLowered(RTW_BUILD_SIGNALS)) return;
|
||||
|
||||
VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method);
|
||||
return;
|
||||
@@ -1310,11 +1310,19 @@ static void SignalBuildWndProc(Window *w, WindowEvent *e)
|
||||
break;
|
||||
|
||||
case BSW_DRAG_SIGNALS_DENSITY_DECREASE:
|
||||
if (_patches.drag_signals_density > 1) _patches.drag_signals_density--;
|
||||
if (_patches.drag_signals_density > 1) {
|
||||
_patches.drag_signals_density--;
|
||||
const Window *w = FindWindowById(WC_GAME_OPTIONS, 0);
|
||||
if (w != NULL) SetWindowDirty(w);
|
||||
}
|
||||
break;
|
||||
|
||||
case BSW_DRAG_SIGNALS_DENSITY_INCREASE:
|
||||
if (_patches.drag_signals_density < 20) _patches.drag_signals_density++;
|
||||
if (_patches.drag_signals_density < 20) {
|
||||
_patches.drag_signals_density++;
|
||||
const Window *w = FindWindowById(WC_GAME_OPTIONS, 0);
|
||||
if (w != NULL) SetWindowDirty(w);
|
||||
}
|
||||
break;
|
||||
|
||||
default: break;
|
||||
|
||||
Reference in New Issue
Block a user