From b522f73ba8f6c53f75639fc4f5d6b2a078827513 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 8 Jan 2009 21:16:19 +0000 Subject: (svn r14925) -Fix [FS#2500]: Abort dragging of vehicles in the group window when they are deleted. --- src/group_gui.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'src/group_gui.cpp') diff --git a/src/group_gui.cpp b/src/group_gui.cpp index a59b7830c..7e5996c13 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -694,6 +694,16 @@ public: this->vehicle_sel = INVALID_VEHICLE; this->InvalidateWidget(GRP_WIDGET_LIST_VEHICLE); } + + /** + * Tests whether a given vehicle is selected in the window, and unselects it if necessary. + * Called when the vehicle is deleted. + * @param vehicle Vehicle that is going to be deleted + */ + void UnselectVehicle(VehicleID vehicle) + { + if (this->vehicle_sel == vehicle) ResetObjectToPlace(); + } }; @@ -712,3 +722,22 @@ void ShowCompanyGroup(CompanyID company, VehicleType vehicle_type) WindowNumber num = (vehicle_type << 11) | VLW_GROUP_LIST | company; AllocateWindowDescFront(&_group_desc, num); } + +/** + * Removes the highlight of a vehicle in a group window + * @param *v Vehicle to remove all highlights from + */ +void DeleteGroupHighlightOfVehicle(const Vehicle *v) +{ + VehicleGroupWindow *w; + + /* If we haven't got any vehicles on the mouse pointer, we haven't got any highlighted in any group windows either + * If that is the case, we can skip looping though the windows and save time + */ + if (_special_mouse_mode != WSM_DRAGDROP) return; + + VehicleType vehicle_type = v->type; + w = dynamic_cast(FindWindowById(GetWindowClassForVehicleType(vehicle_type), (vehicle_type << 11) | VLW_GROUP_LIST | v->owner)); + if (w != NULL) w->UnselectVehicle(v->index); +} + -- cgit v1.2.3-54-g00ecf