diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 13:50:28 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-25 13:52:09 +0200 |
commit | c3da77798b876716ce038a30e9aa8517ec158c47 (patch) | |
tree | 99ac6cf5ce37fcb626a12857bb18cf9b444b27f2 /examples/qpa | |
parent | e80b6619524a3720efb5fbe4c2307bec25a12ab8 (diff) |
Added workable QScreen API on top of QPlatformScreen.
QPlatformIntegration::screens() no longer has to be implemented,
implementations should call QPlatformIntegration::screenAdded() for each
screen instead. This is for being able to support adding screens at
run-time later on, by connecting it to a signal in QGuiApplication.
The QGuiGLContext API has changed a bit, by not sending in all the
parameters in the constructor but instead having a create() function.
The createPlatformGLContext() factory in QPlatformIntegration takes a
QGuiGLContext * instead of a QSurfaceFormat and a share context, similar
to how the window and backing store factory functions work.
The XCB plugin has experimental support for connecting to multiple X
displays simultaneously, creating one or more QScreen for each.
Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f
Reviewed-on: http://codereview.qt.nokia.com/2103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'examples/qpa')
-rw-r--r-- | examples/qpa/windows/main.cpp | 12 | ||||
-rw-r--r-- | examples/qpa/windows/window.cpp | 34 | ||||
-rw-r--r-- | examples/qpa/windows/window.h | 6 |
3 files changed, 47 insertions, 5 deletions
diff --git a/examples/qpa/windows/main.cpp b/examples/qpa/windows/main.cpp index 99c24fa017..e4cd14398c 100644 --- a/examples/qpa/windows/main.cpp +++ b/examples/qpa/windows/main.cpp @@ -1,4 +1,5 @@ #include <QGuiApplication> +#include <QScreen> #include "window.h" @@ -15,5 +16,16 @@ int main(int argc, char **argv) Window child(&b); child.setVisible(true); + // create one window on each additional screen as well + + QList<QScreen *> screens = app.screens(); + foreach (QScreen *screen, screens) { + if (screen == app.primaryScreen()) + continue; + Window *window = new Window(screen); + window->setVisible(true); + window->setWindowTitle(screen->name()); + } + return app.exec(); } diff --git a/examples/qpa/windows/window.cpp b/examples/qpa/windows/window.cpp index bbfc6a3116..fecc22034a 100644 --- a/examples/qpa/windows/window.cpp +++ b/examples/qpa/windows/window.cpp @@ -14,13 +14,23 @@ QColor colorTable[] = QColor("#c0ef8f") }; +Window::Window(QScreen *screen) + : QWindow(screen) + , m_backgroundColorIndex(colorIndexId++) +{ + initialize(); +} + Window::Window(QWindow *parent) : QWindow(parent) , m_backgroundColorIndex(colorIndexId++) { - setWindowTitle(QLatin1String("Window")); + initialize(); +} - if (parent) +void Window::initialize() +{ + if (parent()) setGeometry(QRect(160, 120, 320, 240)); else { setGeometry(QRect(10, 10, 640, 480)); @@ -38,6 +48,7 @@ Window::Window(QWindow *parent) m_image.fill(colorTable[m_backgroundColorIndex % (sizeof(colorTable) / sizeof(colorTable[0]))].rgba()); m_lastPos = QPoint(-1, -1); + m_renderTimer = 0; } void Window::mousePressEvent(QMouseEvent *event) @@ -54,7 +65,7 @@ void Window::mouseMoveEvent(QMouseEvent *event) m_lastPos = event->pos(); } - render(); + scheduleRender(); } void Window::mouseReleaseEvent(QMouseEvent *event) @@ -66,12 +77,12 @@ void Window::mouseReleaseEvent(QMouseEvent *event) m_lastPos = QPoint(-1, -1); } - render(); + scheduleRender(); } void Window::exposeEvent(QExposeEvent *) { - render(); + scheduleRender(); } void Window::resizeEvent(QResizeEvent *) @@ -106,7 +117,20 @@ void Window::keyPressEvent(QKeyEvent *event) m_text.append(event->text()); break; } + scheduleRender(); +} + +void Window::scheduleRender() +{ + if (!m_renderTimer) + m_renderTimer = startTimer(1); +} + +void Window::timerEvent(QTimerEvent *) +{ render(); + killTimer(m_renderTimer); + m_renderTimer = 0; } void Window::render() diff --git a/examples/qpa/windows/window.h b/examples/qpa/windows/window.h index 546cf67bce..bf664d148e 100644 --- a/examples/qpa/windows/window.h +++ b/examples/qpa/windows/window.h @@ -5,6 +5,7 @@ class Window : public QWindow { public: Window(QWindow *parent = 0); + Window(QScreen *screen); protected: void mousePressEvent(QMouseEvent *); @@ -16,12 +17,17 @@ protected: void exposeEvent(QExposeEvent *); void resizeEvent(QResizeEvent *); + void timerEvent(QTimerEvent *); + private: void render(); + void scheduleRender(); + void initialize(); QString m_text; QImage m_image; QPoint m_lastPos; int m_backgroundColorIndex; QBackingStore *m_backingStore; + int m_renderTimer; }; |