diff options
author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-06-19 17:09:06 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 15:42:44 +0200 |
commit | 7042de0894b8d75b75b7a010b22b5fab5835754f (patch) | |
tree | 33eddf8bc27c07c26420158917806e05d71cd6c2 /src/plugins/platforms/eglfs/qeglfscursor.cpp | |
parent | 1655cb5a690895631238b5b7a9a1f0c8ad32fbc4 (diff) |
eglfs: move m_pos into Cursor
Change-Id: I51e92d265e7ea6372ae58b357f75362e2d9a2df9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/eglfs/qeglfscursor.cpp')
-rw-r--r-- | src/plugins/platforms/eglfs/qeglfscursor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp index 8627cfb875..a0bfa80887 100644 --- a/src/plugins/platforms/eglfs/qeglfscursor.cpp +++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QEglFSCursor::QEglFSCursor(QEglFSScreen *screen) - : m_screen(screen), m_pos(0, 0), m_program(0), m_vertexCoordEntry(0), m_textureCoordEntry(0), m_textureEntry(0) + : m_screen(screen), m_program(0), m_vertexCoordEntry(0), m_textureCoordEntry(0), m_textureEntry(0) { initCursorAtlas(); @@ -224,23 +224,23 @@ bool QEglFSCursor::setCurrentCursor(QCursor *cursor) void QEglFSCursor::update(const QRegion &rgn) { - QWindowSystemInterface::handleSynchronousExposeEvent(m_screen->topLevelAt(m_pos), rgn); + QWindowSystemInterface::handleSynchronousExposeEvent(m_screen->topLevelAt(m_cursor.pos), rgn); } QRect QEglFSCursor::cursorRect() const { - return QRect(m_pos - m_cursor.hotSpot, m_cursor.size); + return QRect(m_cursor.pos - m_cursor.hotSpot, m_cursor.size); } QPoint QEglFSCursor::pos() const { - return m_pos; + return m_cursor.pos; } void QEglFSCursor::setPos(const QPoint &pos) { const QRect oldCursorRect = cursorRect(); - m_pos = pos; + m_cursor.pos = pos; update(oldCursorRect | cursorRect()); } @@ -249,7 +249,7 @@ void QEglFSCursor::pointerEvent(const QMouseEvent &event) if (event.type() != QEvent::MouseMove) return; const QRect oldCursorRect = cursorRect(); - m_pos = event.pos(); + m_cursor.pos = event.pos(); update(oldCursorRect | cursorRect()); } |