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

(svn r27450) -Feature[FS#6391](r27446): Lower the sell-chain button in the train depot GUI while dragging a vehicle over it. (Eearslya)

release/1.6
alberth 2015-11-20 09:25:27 +00:00
parent ee39fdef8e
commit 3ccfc954f3
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/depot_gui.cpp
View File

@ -229,7 +229,7 @@ struct DepotWindow : Window {
VehicleID vehicle_over; ///< Rail vehicle over which another one is dragged, \c INVALID_VEHICLE if none. VehicleID vehicle_over; ///< Rail vehicle over which another one is dragged, \c INVALID_VEHICLE if none.
VehicleType type; VehicleType type;
bool generate_list; bool generate_list;
bool sell_hovered; ///< A vehicle is being dragged/hovered over the sell button. int hovered_widget; ///< Index of the widget being hovered during drag/drop. -1 if no drag is in progress.
VehicleList vehicle_list; VehicleList vehicle_list;
VehicleList wagon_list; VehicleList wagon_list;
uint unitnumber_digits; uint unitnumber_digits;
@ -244,7 +244,7 @@ struct DepotWindow : Window {
this->sel = INVALID_VEHICLE; this->sel = INVALID_VEHICLE;
this->vehicle_over = INVALID_VEHICLE; this->vehicle_over = INVALID_VEHICLE;
this->generate_list = true; this->generate_list = true;
this->sell_hovered = false; this->hovered_widget = -1;
this->type = type; this->type = type;
this->num_columns = 1; // for non-trains this gets set in FinishInitNested() this->num_columns = 1; // for non-trains this gets set in FinishInitNested()
this->unitnumber_digits = 2; this->unitnumber_digits = 2;
@ -870,21 +870,26 @@ struct DepotWindow : Window {
this->vehicle_over = INVALID_VEHICLE; this->vehicle_over = INVALID_VEHICLE;
this->SetWidgetDirty(WID_D_MATRIX); this->SetWidgetDirty(WID_D_MATRIX);
if (this->sell_hovered) { if (this->hovered_widget != -1) {
this->SetWidgetLoweredState(WID_D_SELL, false); this->SetWidgetLoweredState(this->hovered_widget, false);
this->SetWidgetDirty(WID_D_SELL); this->SetWidgetDirty(this->hovered_widget);
this->sell_hovered = false; this->hovered_widget = -1;
} }
} }
virtual void OnMouseDrag(Point pt, int widget) virtual void OnMouseDrag(Point pt, int widget)
{ {
if (this->sel == INVALID_VEHICLE) return; if (this->sel == INVALID_VEHICLE) return;
bool is_sell_widget = widget == WID_D_SELL; if (widget != this->hovered_widget) {
if (is_sell_widget != this->sell_hovered) { if (this->hovered_widget == WID_D_SELL || this->hovered_widget == WID_D_SELL_CHAIN) {
this->sell_hovered = is_sell_widget; this->SetWidgetLoweredState(this->hovered_widget, false);
this->SetWidgetLoweredState(WID_D_SELL, is_sell_widget); this->SetWidgetDirty(this->hovered_widget);
this->SetWidgetDirty(WID_D_SELL); }
this->hovered_widget = widget;
if (this->hovered_widget == WID_D_SELL || this->hovered_widget == WID_D_SELL_CHAIN) {
this->SetWidgetLoweredState(this->hovered_widget, true);
this->SetWidgetDirty(this->hovered_widget);
}
} }
if (this->type != VEH_TRAIN) return; if (this->type != VEH_TRAIN) return;
@ -975,7 +980,7 @@ struct DepotWindow : Window {
this->SetDirty(); this->SetDirty();
break; break;
} }
this->sell_hovered = false; this->hovered_widget = -1;
_cursor.vehchain = false; _cursor.vehchain = false;
} }