From c3506d07addc61a1e738b81e68ef4059d68be7f1 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 11 Dec 2013 23:56:04 +0100 Subject: [PATCH] OP-112 OP-1120 bring waypoint editor to the front it case it was open and hidden away --- .../openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp index c8b193a84..43e7ac02b 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp @@ -502,7 +502,8 @@ void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event) contextMenu.addAction(wayPointEditorAct); contextMenu.addAction(addWayPointActFromContextMenu); - if (m_mouse_waypoint) { // we have a waypoint under the mouse + if (m_mouse_waypoint) { + // we have a waypoint under the mouse contextMenu.addAction(editWayPointAct); lockWayPointAct->setChecked(waypoint_locked); @@ -1870,8 +1871,12 @@ void OPMapGadgetWidget::onUAVTrailDistanceActGroup_triggered(QAction *action) void OPMapGadgetWidget::onOpenWayPointEditorAct_triggered() { + // open dialog table->show(); + // bring dialog to the front in case it was already open and hidden away + table->raise(); } + void OPMapGadgetWidget::onAddWayPointAct_triggeredFromContextMenu() { onAddWayPointAct_triggered(m_context_menu_lat_lon);