FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Roni Zanolli,Added use of Qt's new devicePixelRatio() method to assist with handling the upscalling of resolution on iPhone for "retina" displays.

Browse Source 
From Robert Osfield, changed Roni's code to use a #define GETDEVICEPIXELRATIO to access the versioned Qt devicePixelRatio() method to avoid duplication of the Qt version checking.
This commit is contained in:
Robert Osfield 2014-01-20 10:40:49 +00:00
parent 0d4a448c34
commit 6246cd5d85
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osgQt/GraphicsWindowQt
View File

@ -109,6 +109,7 @@ protected:
QSet<QEvent::Type> _eventCompressor; QSet<QEvent::Type> _eventCompressor;
bool _forwardKeyEvents; bool _forwardKeyEvents;
qreal _devicePixelRatio;
virtual void resizeEvent( QResizeEvent* event ); virtual void resizeEvent( QResizeEvent* event );
virtual void moveEvent( QMoveEvent* event ); virtual void moveEvent( QMoveEvent* event );

26
src/osgQt/GraphicsWindowQt.cpp
View File

@ -126,11 +126,18 @@ void timerEvent( QTimerEvent *event );
static HeartBeat heartBeat; static HeartBeat heartBeat;
#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
#define GETDEVICEPIXELRATIO() 1.0
#else
#define GETDEVICEPIXELRATIO() devicePixelRatio()
#endif
GLWidget::GLWidget( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f, bool forwardKeyEvents ) GLWidget::GLWidget( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f, bool forwardKeyEvents )
: QGLWidget(parent, shareWidget, f), : QGLWidget(parent, shareWidget, f),
_gw( NULL ), _gw( NULL ),
_forwardKeyEvents( forwardKeyEvents ) _forwardKeyEvents( forwardKeyEvents )
{ {
_devicePixelRatio = GETDEVICEPIXELRATIO();
} }
GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f, GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f,
@ -139,6 +146,7 @@ GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* share
_gw( NULL ), _gw( NULL ),
_forwardKeyEvents( forwardKeyEvents ) _forwardKeyEvents( forwardKeyEvents )
{ {
_devicePixelRatio = GETDEVICEPIXELRATIO();
} }
GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f, GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f,
@ -147,6 +155,7 @@ GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* s
_gw( NULL ), _gw( NULL ),
_forwardKeyEvents( forwardKeyEvents ) _forwardKeyEvents( forwardKeyEvents )
{ {
_devicePixelRatio = GETDEVICEPIXELRATIO();
} }
GLWidget::~GLWidget() GLWidget::~GLWidget()
@ -238,16 +247,17 @@ void GLWidget::setKeyboardModifiers( QInputEvent* event )
void GLWidget::resizeEvent( QResizeEvent* event ) void GLWidget::resizeEvent( QResizeEvent* event )
{ {
const QSize& size = event->size(); const QSize& size = event->size();
_gw->resized( x(), y(), size.width(), size.height() );
_gw->getEventQueue()->windowResize( x(), y(), size.width(), size.height() ); _gw->resized( x(), y(), size.width()*_devicePixelRatio, size.height()*_devicePixelRatio );
_gw->getEventQueue()->windowResize( x(), y(), size.width()*_devicePixelRatio, size.height()*_devicePixelRatio );
_gw->requestRedraw(); _gw->requestRedraw();
} }
void GLWidget::moveEvent( QMoveEvent* event ) void GLWidget::moveEvent( QMoveEvent* event )
{ {
const QPoint& pos = event->pos(); const QPoint& pos = event->pos();
_gw->resized( pos.x(), pos.y(), width(), height() ); _gw->resized( pos.x(), pos.y(), width()*_devicePixelRatio, height()*_devicePixelRatio );
_gw->getEventQueue()->windowResize( pos.x(), pos.y(), width(), height() ); _gw->getEventQueue()->windowResize( pos.x(), pos.y(), width()*_devicePixelRatio, height()*_devicePixelRatio );
} }
void GLWidget::glDraw() void GLWidget::glDraw()
@ -298,7 +308,7 @@ void GLWidget::mousePressEvent( QMouseEvent* event )
default: button = 0; break; default: button = 0; break;
} }
setKeyboardModifiers( event ); setKeyboardModifiers( event );
_gw->getEventQueue()->mouseButtonPress( event->x(), event->y(), button ); _gw->getEventQueue()->mouseButtonPress( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
} }
void GLWidget::mouseReleaseEvent( QMouseEvent* event ) void GLWidget::mouseReleaseEvent( QMouseEvent* event )
@ -313,7 +323,7 @@ void GLWidget::mouseReleaseEvent( QMouseEvent* event )
default: button = 0; break; default: button = 0; break;
} }
setKeyboardModifiers( event ); setKeyboardModifiers( event );
_gw->getEventQueue()->mouseButtonRelease( event->x(), event->y(), button ); _gw->getEventQueue()->mouseButtonRelease( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
} }
void GLWidget::mouseDoubleClickEvent( QMouseEvent* event ) void GLWidget::mouseDoubleClickEvent( QMouseEvent* event )
@ -328,13 +338,13 @@ void GLWidget::mouseDoubleClickEvent( QMouseEvent* event )
default: button = 0; break; default: button = 0; break;
} }
setKeyboardModifiers( event ); setKeyboardModifiers( event );
_gw->getEventQueue()->mouseDoubleButtonPress( event->x(), event->y(), button ); _gw->getEventQueue()->mouseDoubleButtonPress( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
} }
void GLWidget::mouseMoveEvent( QMouseEvent* event ) void GLWidget::mouseMoveEvent( QMouseEvent* event )
{ {
setKeyboardModifiers( event ); setKeyboardModifiers( event );
_gw->getEventQueue()->mouseMotion( event->x(), event->y() ); _gw->getEventQueue()->mouseMotion( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio );
} }
void GLWidget::wheelEvent( QWheelEvent* event ) void GLWidget::wheelEvent( QWheelEvent* event )