cpp/openttd-patchpack/source Changeset - r25966:8233c136b1b0

Changeset - r25966:8233c136b1b0

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Bernard Teo - 3 years ago 2021-05-31 07:59:17
btzy1996@hotmail.com

Feature: Ctrl-Clicking GB_SHARED_ORDERS vehicle list opens order window

2 files changed with 19 insertions and 12 deletions:

src/group_gui.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/group_gui.cpp

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ @@
 #include "core/geometry_func.hpp"
 #include "company_base.h"
 #include "company_gui.h"
 #include "gui.h"
 #include "widgets/group_widget.h"
@@ @@ -745,17 +746,19 @@ public: @@
 						NOT_REACHED();
+				}
 				if (v) {
 					this->vehicle_sel = v->index;
 					if (_ctrl_pressed) {
 						this->SelectGroup(v->group_id);
 						if (this->grouping == GB_NONE) {
 							this->SelectGroup(v->group_id);
 						} else {
 							ShowOrdersWindow(v);
+						}
 					} else {
 						this->vehicle_sel = v->index;
 						SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
 						SetMouseCursorVehicle(v, EIT_IN_LIST);
 						_cursor.vehchain = true;
 						this->SetDirty();
+					}
 					SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
 					SetMouseCursorVehicle(v, EIT_IN_LIST);
 					_cursor.vehchain = true;
 					this->SetDirty();
+				}
 				break;

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -1843,10 +1843,14 @@ public: @@
 						const Vehicle *v = vehgroup.vehicles_begin[0];
 						/* We do not support VehicleClicked() here since the contextual action may only make sense for individual vehicles */
 						if (vehgroup.NumVehicles() == 1) {
 							ShowVehicleViewWindow(v);
 						if (_ctrl_pressed) {
 							ShowOrdersWindow(v);
 						} else {
 							ShowVehicleListWindow(v);
 							if (vehgroup.NumVehicles() == 1) {
 								ShowVehicleViewWindow(v);
 							} else {
 								ShowVehicleListWindow(v);
+							}
+						}
 						break;
+					}

0 comments (0 inline, 0 general)