diff options
| author | planetmaker <planetmaker@openttd.org> | 2013-10-13 11:06:05 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2013-10-13 11:06:05 +0000 |
| commit | 2609693fe8cff2c0274e5d7d796a984cbde594cf (patch) | |
| tree | 15ef1d5d6f399d00e223d08a41f0ed4f698b53f1 /src | |
| parent | 7ed5f6edf9990e3b42180d23d9e00b4bf6c89533 (diff) | |
| download | openttd-2609693fe8cff2c0274e5d7d796a984cbde594cf.tar.xz | |
(svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88)
Diffstat (limited to 'src')
| -rw-r--r-- | src/order_gui.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/order_gui.cpp b/src/order_gui.cpp index d129319cd..231e5938f 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -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. */ |