aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgflickable.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-1997/+0
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix coding style issuesKent Hansen2011-10-171-2/+2
| | | | | | | Avoid Qt Sanity Bot noise when these files are moved. Change-Id: I714e949837909883fe7e387ae336d2ffc4a1912b Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Manually apply SnapOneItem/Row changes from Qt 4.7Martin Jones2011-09-281-60/+55
| | | | | | | | | | | | Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items: cf23188de237009136fa1480ab8fd9e3ca364769 f85819fe083ae7c6804c884de68e906d153a6d11 09cd2f818208a83489fae034b80e6497b7cc83af Task-number: QTBUG-20683 Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7 Reviewed-on: http://codereview.qt-project.org/5484 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add convenience macro for fast connects in declarative.Michael Brasser2011-09-271-14/+2
| | | | | | | | | | | | We already follow this pattern several places, so this commit creates a convenience macro for it, and replaces previous usage where appropriate. Also adds the macro several places as further optimization. Change-Id: Ieff5ed6cc51c34d0a1c8aa42ac40314ea243477a Reviewed-on: http://codereview.qt-project.org/5342 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Support margins in Flickable.Martin Jones2011-09-261-6/+149
| | | | | | | | | | | It is sometimes desireable to leave a margin/add decoration around the content of a Flickable. This adds topMargin, leftMargin, bottomMargin rightMargin, xOrigin and yOrigin properties to Flickable. Task-number: QTBUG-21362 Change-Id: Ia24ea4c63e7a8de683b68100baac782c6f3a66bb Reviewed-on: http://codereview.qt-project.org/5445 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-09-161-9/+21
| | | | | | | | | | | | | | | Change 55cfbdb7c64068ae68f7baaceb8acfb96cb0c07e manually applied from Qt 4.7 Ensure the smoothed velocity is set at the start of the flick. Ensure that the smoothed velocity animation isn't restarted unless there is new valid data. Change-Id: Ia77249be9980aba268a1bfa0ea3f69c49fa09e5e Reviewed-by: Bea Lam Reviewed-on: http://codereview.qt-project.org/4712 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-131-60/+36
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/context2d/qsgcanvasitem.cpp src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/context2d/qsgcontext2d_p_p.h src/declarative/particles/qsgcustomparticle.cpp src/declarative/particles/qsgparticlesystem.cpp Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
| * Merge branch 'master' into refactorGunnar Sletta2011-09-121-2/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * | Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-011-5/+6
| | | | | | | | | | | | | | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Use QMouseEvent instead of QGraphicsSceneMouseEventLars Knoll2011-09-011-55/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMouseEvent now supports floating point coordinates, and the graphics scene event is not be available in QtGui anymore. Change-Id: I28ab428a2d00fc1deef55b05c1c545e74838e105 Reviewed-on: http://codereview.qt.nokia.com/3991 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Merge branch 'master' into refactorGunnar Sletta2011-08-251-0/+278
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * | | Build against refactor.Samuel Rødal2011-07-291-2/+2
| | | | | | | | | | | | | | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* | | | Port change 67ed1849 from Qt 4.7Martin Jones2011-09-121-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flickable could flick in wrong direction if given too few touch samples If we got <= QML_FLICK_DISCARDSAMPLES the previous velocity was not cleared, so the view would continue flicking with the previous velocity, and therefore the previous direction. Task-number: QT-4903 Change-Id: Ie4c2a3829026c0bf7d94cf5b60c0b7ff9833f725 Reviewed-on: http://codereview.qt-project.org/4618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | | Experimental 'pixelAligned' property for Flickable.Martin Jones2011-09-121-2/+19
| |/ |/| | | | | | | | | | | Change-Id: I671af87c4d2db3403ab506ae32608c91d6982338 Reviewed-on: http://codereview.qt-project.org/4506 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* | Add documentationAlan Alpert2011-08-091-0/+275
| | | | | | | | | | | | | | | | | | Copy the documentation back to the scenegraph items, and update it to the new module syntax. Change-Id: I5d030a231f991a209a8593ddb069e1b6cd03580e Reviewed-on: http://codereview.qt.nokia.com/2735 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Nesting PathView and Flickable causes PathView to stop at wrong offsetMartin Jones2011-08-021-0/+3
|/ | | | | | | | | | | Don't stop current animation until a drag is actually initiated. Also ensure we handle a stolen grab sensibly. Change-Id: I0ad493595fb85e1c9bace2d805184f911341fce2 Fixes: QTBUG-19439 Reviewed-on: http://codereview.qt.nokia.com/2420 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Clicking on a disabled ListView's delegate breaks mouse interactionMartin Jones2011-07-291-1/+1
| | | | | | | | | | A disabled Flickable should not filter children. Change-Id: I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0 Fixes: QTBUG-20584 Reviewed-on: http://codereview.qt.nokia.com/2354 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add dragging properties to FlickableMartin Jones2011-07-281-2/+97
| | | | | | | | | | | | This allows the user to determine when a movement is due to the user dragging the view directly, i.e. excluding any flick that occurs after the touch is released. Change-Id: Idf4b699946f808da6fa34ec21a3d2cb2f0ec9de6 Fixes: QTBUG-19685 Reviewed-on: http://codereview.qt.nokia.com/2310 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Handle pinch correctly when one point is released and repressed.Martin Jones2011-07-251-2/+1
| | | | | | | | | | | | | The pinch is not finished at the time one point is released. Ensure that a onPinchStarted is called each time a repress happens, and that onPinchFinished is called when all points are released. Fixes: QTBUG-19632 Change-Id: I467dd612383f7dd11d58a9df063dd86860796216 Reviewed-on: http://codereview.qt.nokia.com/2059 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Use QWheelEvent instead of QGraphicsSceneWheelEventLars Knoll2011-07-071-1/+1
| | | | | | | | | | Since WheelEvent is not floating point based, we can use it instead of the graphics scene event. Change-Id: Ifa8411ca9c3a986ea311c8741f60213637b7c6ae Reviewed-on: http://codereview.qt.nokia.com/1140 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Doc: Cleaned up the scene graph documentation a little.David Boddie2011-06-091-1/+0
|
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-05-041-75/+173
|\ | | | | | | into qtquick2
| * Update SG items with GV item changes.Martin Jones2011-05-041-75/+173
| |
* | Don't round flickable positions while panningGunnar Sletta2011-05-021-6/+6
|/
* Initial import from qtquick2.Qt by Nokia2011-04-271-0/+1397
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:17:45 +0000