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

(svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88)

Browse Source
This commit is contained in:
planetmaker 2013-10-13 11:06:05 +00:00
parent 7ed5f6edf9
commit 2609693fe8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/order_gui.cpp
View File

@ -644,7 +644,6 @@ private:
*/ */
void OrderClick_Conditional() void OrderClick_Conditional()
{ {
this->LowerWidget(WID_O_GOTO);
this->SetWidgetDirty(WID_O_GOTO); this->SetWidgetDirty(WID_O_GOTO);
SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_NONE, this); SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_NONE, this);
this->goto_type = OPOS_CONDITIONAL; this->goto_type = OPOS_CONDITIONAL;
@ -655,7 +654,6 @@ private:
*/ */
void OrderClick_Share() void OrderClick_Share()
{ {
this->LowerWidget(WID_O_GOTO);
this->SetWidgetDirty(WID_O_GOTO); this->SetWidgetDirty(WID_O_GOTO);
SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_VEHICLE, this); SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, HT_VEHICLE, this);
this->goto_type = OPOS_SHARE; this->goto_type = OPOS_SHARE;
@ -1111,7 +1109,11 @@ public:
virtual void OnPaint() 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(); this->DrawWidgets();
} }
@ -1501,7 +1503,6 @@ public:
virtual void OnPlaceObjectAbort() virtual void OnPlaceObjectAbort()
{ {
this->goto_type = OPOS_NONE; this->goto_type = OPOS_NONE;
this->RaiseWidget(WID_O_GOTO);
this->SetWidgetDirty(WID_O_GOTO); this->SetWidgetDirty(WID_O_GOTO);
/* Remove drag highlighting if it exists. */ /* Remove drag highlighting if it exists. */