From f553af3c3b4b5ef17637616a7bb0e1d7afcd4a87 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 1 Dec 2015 13:14:39 +0300 Subject: [PATCH] Fixed right button's menu position in Qt app --- qt/draw_widget.cpp | 6 +++--- qt/draw_widget.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 4c85678124..e788b95e03 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -329,7 +329,7 @@ void DrawWidget::mousePressEvent(QMouseEvent * e) } } else if (IsRightButton(e)) - ShowInfoPopup(pt); + ShowInfoPopup(e, pt); } void DrawWidget::mouseDoubleClickEvent(QMouseEvent * e) @@ -461,7 +461,7 @@ void DrawWidget::SubmitRoutingPoint(m2::PointD const & pt) m_framework->BuildRoute(m_framework->PtoG(pt), 0 /* timeoutSec */); } -void DrawWidget::ShowInfoPopup(m2::PointD const & pt) +void DrawWidget::ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt) { // show feature types QMenu menu; @@ -487,7 +487,7 @@ void DrawWidget::ShowInfoPopup(m2::PointD const & pt) addStringFn(info.FormatAddress()); addStringFn(info.FormatTypes()); - menu.exec(); + menu.exec(e->pos()); } void DrawWidget::OnViewportChanged(ScreenBase const & screen) diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 70c07b134f..4ac6a9120b 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -88,7 +88,7 @@ namespace qt private: void SubmitFakeLocationPoint(m2::PointD const & pt); void SubmitRoutingPoint(m2::PointD const & pt); - void ShowInfoPopup(m2::PointD const & pt); + void ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt); void OnViewportChanged(ScreenBase const & screen); void UpdateScaleControl();