Changeset - r20814:d02f6595e909
[Not reviewed]
master
0 1 0
planetmaker - 11 years ago 2013-10-13 11:06:05
planetmaker@openttd.org
(svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88)
1 file changed with 5 insertions and 4 deletions:
0 comments (0 inline, 0 general)
src/order_gui.cpp
Show inline comments
 
@@ -644,7 +644,6 @@ private:
 
	 */
 
	void OrderClick_Conditional()
 
	{
 
		this->LowerWidget(WID_O_GOTO);
 
		this->SetWidgetDirty(WID_O_GOTO);
 
		SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_NONE, this);
 
		this->goto_type = OPOS_CONDITIONAL;
 
@@ -655,7 +654,6 @@ private:
 
	 */
 
	void OrderClick_Share()
 
	{
 
		this->LowerWidget(WID_O_GOTO);
 
		this->SetWidgetDirty(WID_O_GOTO);
 
		SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_VEHICLE, this);
 
		this->goto_type = OPOS_SHARE;
 
@@ -1111,7 +1109,11 @@ public:
 

	
 
	virtual void OnPaint()
 
	{
 
		if (this->vehicle->owner != _local_company) this->selected_order = -1; // Disable selection any selected row at a competitor order window.
 
		if (this->vehicle->owner != _local_company) {
 
			this->selected_order = -1; // Disable selection any selected row at a competitor order window.
 
		} else {
 
			this->SetWidgetLoweredState(WID_O_GOTO, this->goto_type != OPOS_NONE);
 
		}
 
		this->DrawWidgets();
 
	}
 

	
 
@@ -1501,7 +1503,6 @@ public:
 
	virtual void OnPlaceObjectAbort()
 
	{
 
		this->goto_type = OPOS_NONE;
 
		this->RaiseWidget(WID_O_GOTO);
 
		this->SetWidgetDirty(WID_O_GOTO);
 

	
 
		/* Remove drag highlighting if it exists. */
0 comments (0 inline, 0 general)