peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoiding deprecation warnings

Browse Source
This commit is contained in:
Uwe Rathmann 2021-12-29 15:21:09 +01:00
parent aca538a89d
commit 05bb54e48d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/qvgviewer/MainWindow.cpp
View File

@ -22,6 +22,7 @@
#ifdef CONTEXT_MENU #ifdef CONTEXT_MENU
#include <QskMenu.h> #include <QskMenu.h>
#include <QskEvent.h>
#endif #endif
#include <QDir> #include <QDir>
@ -91,7 +92,7 @@ class GraphicLabel : public QskGraphicLabel
menu->addItem( "image://shapes/Ellipse/Red", "Setup" ); menu->addItem( "image://shapes/Ellipse/Red", "Setup" );
menu->addItem( "image://shapes/Hexagon/PapayaWhip", "Help" ); menu->addItem( "image://shapes/Hexagon/PapayaWhip", "Help" );
menu->setOrigin( event->localPos() ); menu->setOrigin( qskMousePosition( event ) );
menu->open(); menu->open();
connect( menu, &QskMenu::triggered, connect( menu, &QskMenu::triggered,

7
src/controls/QskMenu.cpp
View File

@ -5,6 +5,7 @@
#include <QskGraphic.h> #include <QskGraphic.h>
#include <QskColorFilter.h> #include <QskColorFilter.h>
#include <QskSkinlet.h> #include <QskSkinlet.h>
#include <QskEvent.h>
#include <qvector.h> #include <qvector.h>
#include <qvariant.h> #include <qvariant.h>
@ -256,9 +257,11 @@ QskColorFilter QskMenu::graphicFilterAt( int index ) const
void QskMenu::mousePressEvent( QMouseEvent* event ) void QskMenu::mousePressEvent( QMouseEvent* event )
{ {
// QGuiApplication::styleHints()->setFocusOnTouchRelease ??
if ( event->button() == Qt::LeftButton ) if ( event->button() == Qt::LeftButton )
{ {
const auto index = indexAtPosition( event->localPos() ); const auto index = indexAtPosition( qskMousePosition( event ) );
if ( index >= 0 ) if ( index >= 0 )
{ {
setCurrentIndex( index ); setCurrentIndex( index );
@ -275,7 +278,7 @@ void QskMenu::mouseReleaseEvent( QMouseEvent* event )
{ {
m_data->isPressed = false; m_data->isPressed = false;
const auto index = indexAtPosition( event->localPos() ); const auto index = indexAtPosition( qskMousePosition( event ) );
if ( index == m_data->currentIndex ) if ( index == m_data->currentIndex )
setSelectedIndex( index ); setSelectedIndex( index );
} }