From 05bb54e48d0162292577b77805c5f6ba700f756f Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Wed, 29 Dec 2021 15:21:09 +0100
Subject: [PATCH] avoiding deprecation warnings

---
 examples/qvgviewer/MainWindow.cpp | 3 ++-
 src/controls/QskMenu.cpp          | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/qvgviewer/MainWindow.cpp b/examples/qvgviewer/MainWindow.cpp
index 82ce3ed1..14ce76ab 100644
--- a/examples/qvgviewer/MainWindow.cpp
+++ b/examples/qvgviewer/MainWindow.cpp
@@ -22,6 +22,7 @@
 
 #ifdef CONTEXT_MENU
     #include <QskMenu.h>
+    #include <QskEvent.h>
 #endif
 
 #include <QDir>
@@ -91,7 +92,7 @@ class GraphicLabel : public QskGraphicLabel
         menu->addItem( "image://shapes/Ellipse/Red", "Setup" );
         menu->addItem( "image://shapes/Hexagon/PapayaWhip", "Help" );
 
-        menu->setOrigin( event->localPos() );
+        menu->setOrigin( qskMousePosition( event ) );
         menu->open();
 
         connect( menu, &QskMenu::triggered,
diff --git a/src/controls/QskMenu.cpp b/src/controls/QskMenu.cpp
index c4ee84dc..c013e646 100644
--- a/src/controls/QskMenu.cpp
+++ b/src/controls/QskMenu.cpp
@@ -5,6 +5,7 @@
 #include <QskGraphic.h>
 #include <QskColorFilter.h>
 #include <QskSkinlet.h>
+#include <QskEvent.h>
 
 #include <qvector.h>
 #include <qvariant.h>
@@ -256,9 +257,11 @@ QskColorFilter QskMenu::graphicFilterAt( int index ) const
 
 void QskMenu::mousePressEvent( QMouseEvent* event )
 {
+    // QGuiApplication::styleHints()->setFocusOnTouchRelease ??
+
     if ( event->button() == Qt::LeftButton )
     {
-        const auto index = indexAtPosition( event->localPos() );
+        const auto index = indexAtPosition( qskMousePosition( event ) );
         if ( index >= 0 )
         {
             setCurrentIndex( index );
@@ -275,7 +278,7 @@ void QskMenu::mouseReleaseEvent( QMouseEvent* event )
         {
             m_data->isPressed = false;
 
-            const auto index = indexAtPosition( event->localPos() );
+            const auto index = indexAtPosition( qskMousePosition( event ) );
             if ( index == m_data->currentIndex )
                 setSelectedIndex( index );
         }