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-24 01:06:51 +00:00
parent 9bd32e76bd 9ed7fe22fb
commit 9ee5aecbaf
9 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/depot_gui.cpp
View File

@@ -231,7 +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.
int hovered_widget; ///< Index of the widget being hovered during drag/drop. -1 if no drag is in progress.
VehicleList vehicle_list;
VehicleList wagon_list;
uint unitnumber_digits;
@@ -246,7 +246,7 @@ struct DepotWindow : Window {
this->sel = INVALID_VEHICLE;
this->vehicle_over = INVALID_VEHICLE;
this->generate_list = true;
this->sell_hovered = false;
this->hovered_widget = -1;
this->type = type;
this->num_columns = 1; // for non-trains this gets set in FinishInitNested()
this->unitnumber_digits = 2;
@@ -872,21 +872,26 @@ struct DepotWindow : Window {
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;
if (this->hovered_widget != -1) {
this->SetWidgetLoweredState(this->hovered_widget, false);
this->SetWidgetDirty(this->hovered_widget);
this->hovered_widget = -1;
}
}
virtual void OnMouseDrag(Point pt, int widget)
{
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 (widget != this->hovered_widget) {
if (this->hovered_widget == WID_D_SELL || this->hovered_widget == WID_D_SELL_CHAIN) {
this->SetWidgetLoweredState(this->hovered_widget, false);
this->SetWidgetDirty(this->hovered_widget);
}
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;
@@ -977,7 +982,7 @@ struct DepotWindow : Window {
this->SetDirty();
break;
}
this->sell_hovered = false;
this->hovered_widget = -1;
_cursor.vehchain = false;
}