mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27626) -Codechange: Do not use the cursor sprite as PlaceObject status in the main toolbar.

release/1.7
frosch 2016-08-15 18:32:25 +00:00
parent f7a0ee9a15
commit ca6493f2e6
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/toolbar_gui.cpp
View File

@ -79,6 +79,9 @@ enum CallBackFunction {
CBF_PLACE_LANDINFO, CBF_PLACE_LANDINFO,
}; };
static CallBackFunction _last_started_action = CBF_NONE; ///< Last started user action.
/** /**
* Drop down list entry for showing a checked/unchecked toggle item. * Drop down list entry for showing a checked/unchecked toggle item.
*/ */
@ -247,7 +250,7 @@ static ToolbarMode _toolbar_mode;
static CallBackFunction SelectSignTool() static CallBackFunction SelectSignTool()
{ {
if (_cursor.sprite == SPR_CURSOR_SIGN) { if (_last_started_action == CBF_PLACE_SIGN) {
ResetObjectToPlace(); ResetObjectToPlace();
return CBF_NONE; return CBF_NONE;
} else { } else {
@ -1031,7 +1034,7 @@ static CallBackFunction MenuClickNewspaper(int index)
static CallBackFunction PlaceLandBlockInfo() static CallBackFunction PlaceLandBlockInfo()
{ {
if (_cursor.sprite == SPR_CURSOR_QUERY) { if (_last_started_action == CBF_PLACE_LANDINFO) {
ResetObjectToPlace(); ResetObjectToPlace();
return CBF_NONE; return CBF_NONE;
} else { } else {
@ -1656,13 +1659,11 @@ enum MainToolbarHotkeys {
/** Main toolbar. */ /** Main toolbar. */
struct MainToolbarWindow : Window { struct MainToolbarWindow : Window {
CallBackFunction last_started_action; ///< Last started user action.
MainToolbarWindow(WindowDesc *desc) : Window(desc) MainToolbarWindow(WindowDesc *desc) : Window(desc)
{ {
this->InitNested(0); this->InitNested(0);
this->last_started_action = CBF_NONE; _last_started_action = CBF_NONE;
CLRBITS(this->flags, WF_WHITE_BORDER); CLRBITS(this->flags, WF_WHITE_BORDER);
this->SetWidgetDisabledState(WID_TN_PAUSE, _networking && !_network_server); // if not server, disable pause button this->SetWidgetDisabledState(WID_TN_PAUSE, _networking && !_network_server); // if not server, disable pause button
this->SetWidgetDisabledState(WID_TN_FAST_FORWARD, _networking); // if networking, disable fast-forward button this->SetWidgetDisabledState(WID_TN_FAST_FORWARD, _networking); // if networking, disable fast-forward button
@ -1701,7 +1702,7 @@ struct MainToolbarWindow : Window {
virtual void OnDropdownSelect(int widget, int index) virtual void OnDropdownSelect(int widget, int index)
{ {
CallBackFunction cbf = _menu_clicked_procs[widget](index); CallBackFunction cbf = _menu_clicked_procs[widget](index);
if (cbf != CBF_NONE) this->last_started_action = cbf; if (cbf != CBF_NONE) _last_started_action = cbf;
} }
virtual EventState OnHotkey(int hotkey) virtual EventState OnHotkey(int hotkey)
@ -1754,7 +1755,7 @@ struct MainToolbarWindow : Window {
virtual void OnPlaceObject(Point pt, TileIndex tile) virtual void OnPlaceObject(Point pt, TileIndex tile)
{ {
switch (this->last_started_action) { switch (_last_started_action) {
case CBF_PLACE_SIGN: case CBF_PLACE_SIGN:
PlaceProc_Sign(tile); PlaceProc_Sign(tile);
break; break;
@ -1767,6 +1768,11 @@ struct MainToolbarWindow : Window {
} }
} }
virtual void OnPlaceObjectAbort()
{
_last_started_action = CBF_NONE;
}
virtual void OnTick() virtual void OnTick()
{ {
if (this->IsWidgetLowered(WID_TN_PAUSE) != !!_pause_mode) { if (this->IsWidgetLowered(WID_TN_PAUSE) != !!_pause_mode) {
@ -1978,13 +1984,11 @@ enum MainToolbarEditorHotkeys {
}; };
struct ScenarioEditorToolbarWindow : Window { struct ScenarioEditorToolbarWindow : Window {
CallBackFunction last_started_action; ///< Last started user action.
ScenarioEditorToolbarWindow(WindowDesc *desc) : Window(desc) ScenarioEditorToolbarWindow(WindowDesc *desc) : Window(desc)
{ {
this->InitNested(0); this->InitNested(0);
this->last_started_action = CBF_NONE; _last_started_action = CBF_NONE;
CLRBITS(this->flags, WF_WHITE_BORDER); CLRBITS(this->flags, WF_WHITE_BORDER);
PositionMainToolbar(this); PositionMainToolbar(this);
DoZoomInOutWindow(ZOOM_NONE, this); DoZoomInOutWindow(ZOOM_NONE, this);
@ -2043,7 +2047,7 @@ struct ScenarioEditorToolbarWindow : Window {
{ {
if (_game_mode == GM_MENU) return; if (_game_mode == GM_MENU) return;
CallBackFunction cbf = _scen_toolbar_button_procs[widget](this); CallBackFunction cbf = _scen_toolbar_button_procs[widget](this);
if (cbf != CBF_NONE) this->last_started_action = cbf; if (cbf != CBF_NONE) _last_started_action = cbf;
} }
virtual void OnDropdownSelect(int widget, int index) virtual void OnDropdownSelect(int widget, int index)
@ -2052,7 +2056,7 @@ struct ScenarioEditorToolbarWindow : Window {
* editor toolbar, so we need to adjust for it. */ * editor toolbar, so we need to adjust for it. */
if (widget == WID_TE_SMALL_MAP) widget = WID_TN_SMALL_MAP; if (widget == WID_TE_SMALL_MAP) widget = WID_TN_SMALL_MAP;
CallBackFunction cbf = _menu_clicked_procs[widget](index); CallBackFunction cbf = _menu_clicked_procs[widget](index);
if (cbf != CBF_NONE) this->last_started_action = cbf; if (cbf != CBF_NONE) _last_started_action = cbf;
if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP); if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
} }
@ -2084,13 +2088,13 @@ struct ScenarioEditorToolbarWindow : Window {
case MTEHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break; case MTEHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break;
default: return ES_NOT_HANDLED; default: return ES_NOT_HANDLED;
} }
if (cbf != CBF_NONE) this->last_started_action = cbf; if (cbf != CBF_NONE) _last_started_action = cbf;
return ES_HANDLED; return ES_HANDLED;
} }
virtual void OnPlaceObject(Point pt, TileIndex tile) virtual void OnPlaceObject(Point pt, TileIndex tile)
{ {
switch (this->last_started_action) { switch (_last_started_action) {
case CBF_PLACE_SIGN: case CBF_PLACE_SIGN:
PlaceProc_Sign(tile); PlaceProc_Sign(tile);
break; break;
@ -2103,6 +2107,11 @@ struct ScenarioEditorToolbarWindow : Window {
} }
} }
virtual void OnPlaceObjectAbort()
{
_last_started_action = CBF_NONE;
}
virtual void OnTimeout() virtual void OnTimeout()
{ {
this->SetWidgetsLoweredState(false, WID_TE_DATE_BACKWARD, WID_TE_DATE_FORWARD, WIDGET_LIST_END); this->SetWidgetsLoweredState(false, WID_TE_DATE_BACKWARD, WID_TE_DATE_FORWARD, WIDGET_LIST_END);