diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /tests/manual/widgets | |
parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'tests/manual/widgets')
-rw-r--r-- | tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp b/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp index d8c2de6398..186203e7d8 100644 --- a/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp +++ b/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp @@ -69,11 +69,17 @@ public: protected: void mouseMoveEvent(QMouseEvent *event) { + QGraphicsView::mouseMoveEvent(event); + int rightmostInView = viewport()->mapToGlobal(viewport()->geometry().topRight()).x(); int xglobal = event->globalX(); if (xglobal > rightmostInView) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 10); - QGraphicsView::mouseMoveEvent(event); + + int bottomPos = viewport()->mapToGlobal(viewport()->geometry().bottomRight()).y(); + int yglobal = event->globalY(); + if (yglobal > bottomPos) + verticalScrollBar()->setValue(verticalScrollBar()->value() + 10); } }; @@ -82,17 +88,18 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); MyGraphicsView v; - QGraphicsScene s(0.0, 0.0, 10000.0, 100.0); + QGraphicsScene s(0.0, 0.0, 5000.0, 5000.0); v.setScene(&s); v.setInteractive(true); v.setRubberBandSelectionMode(Qt::IntersectsItemBoundingRect); s.addRect( (qreal) 0.0, 0.0, 1000.0, 50.0, QPen(),QBrush(QColor(0,0,255))); - for (int u = 0; u < 100; ++u) { - MyGraphicsItem *item = new MyGraphicsItem(); - item->setRect(QRectF(u * 100, 50.0, 50.0, 20.0)); - s.addItem(item); - } + for (int u = 0; u < 100; ++u) + for (int v = 0; v < 100; ++v) { + MyGraphicsItem *item = new MyGraphicsItem(); + item->setRect(QRectF(v * 80.0, u * 80.0, 50.0, 20.0)); + s.addItem(item); + } v.show(); app.exec(); return 0; |