dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-11-18 23:33:10 +00:00
parent 6939bc7d87 ea3198cc25
commit 7ff6ad1e36
4 changed files with 134 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/depot_gui.cpp
View File

@@ -231,6 +231,7 @@ struct DepotWindow : Window {
VehicleID vehicle_over; ///< Rail vehicle over which another one is dragged, \c INVALID_VEHICLE if none.
VehicleType type;
bool generate_list;
bool sell_hovered; ///< A vehicle is being dragged/hovered over the sell button.
VehicleList vehicle_list;
VehicleList wagon_list;
uint unitnumber_digits;
@@ -245,6 +246,7 @@ struct DepotWindow : Window {
this->sel = INVALID_VEHICLE;
this->vehicle_over = INVALID_VEHICLE;
this->generate_list = true;
this->sell_hovered = false;
this->type = type;
this->num_columns = 1; // for non-trains this gets set in FinishInitNested()
this->unitnumber_digits = 2;
@@ -869,11 +871,24 @@ struct DepotWindow : Window {
this->sel = INVALID_VEHICLE;
this->vehicle_over = INVALID_VEHICLE;
this->SetWidgetDirty(WID_D_MATRIX);
if (this->sell_hovered) {
this->SetWidgetLoweredState(WID_D_SELL, false);
this->SetWidgetDirty(WID_D_SELL);
this->sell_hovered = false;
}
}
virtual void OnMouseDrag(Point pt, int widget)
{
if (this->type != VEH_TRAIN || this->sel == INVALID_VEHICLE) return;
if (this->sel == INVALID_VEHICLE) return;
bool is_sell_widget = widget == WID_D_SELL;
if (is_sell_widget != this->sell_hovered) {
this->sell_hovered = is_sell_widget;
this->SetWidgetLoweredState(WID_D_SELL, is_sell_widget);
this->SetWidgetDirty(WID_D_SELL);
}
if (this->type != VEH_TRAIN) return;
/* A rail vehicle is dragged.. */
if (widget != WID_D_MATRIX) { // ..outside of the depot matrix.
@@ -960,7 +975,9 @@ struct DepotWindow : Window {
default:
this->sel = INVALID_VEHICLE;
this->SetDirty();
break;
}
this->sell_hovered = false;
_cursor.vehchain = false;
}