summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-121-2/+8
| | | | | | | | | | | | | | | | The QGestures will now not be deleted immediatly. QGestureManager waits until all QGestureEvents are processed and will delete the QGestures afterwards. Task: QT-4022 Reviewed By: Zeno Albisser
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Fixed random crash in QGestureManager.Dominik Holland2010-11-091-0/+4
| | | | | | | | | | | | | | When the cachedGestures are cleaned, the Gestures should be removed in all QSets first, before the Delete. Task: QT-4013 Reviewed By: Frederik Gladhorn
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (231 commits) Fixed compile warning on Windows. Fixed painter path drawing on FBO without stencil buffer. qmake: Make smart library merge architecture-aware Slovenian translation: some updates and fixes Fixed memory leak in Symbian when Options menu was launched. Fixed color of cosmetic pens when printing under Windows. Fixed infinite loop when loading jpeg without EOI from memory. Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Added galician translation Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fix one hang of QNAM on Symbian. Update QtDeclarative def files Update QtGui def files Update QtCore bwins def file Fix Symbian def file for a9e5329168 Make build on Symbian ...
| * fix typos in commentFrederik Gladhorn2010-09-131-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Rename some variables to improve readability.Frederik Gladhorn2010-09-211-20/+21
|/ | | | Review-by: Denis Dzyubenko
* Replaced QWeakPointer to *Pointer in QGestureManager.Dominik Holland2010-09-071-1/+2
| | | | | | | | | | The QWeakPointer was part of a key in a QMap. When the QWeakPointer gets deleted, the key changes and the sorting of the Map was wrong. That leads to an random crash. It should be safe not to use QWeakPointer as we remove pointers from the objectGestures map when a widget or graphicsitem gets destroyed. Reviewed-by: Denis Dzyubenko
* Fixed delivering gestures to a toplevel widget.Denis Dzyubenko2010-08-241-2/+3
| | | | | | | | If there is only one widget which is a toplevel, then gestures were not delivered to it because we assumed (wrong) that there is at least one child widget. Reviewed-by: Frederik Gladhorn
* Fix memory leak in gesture managerThomas Zander2010-08-171-1/+6
| | | | | | | | | If the user unregisters a recognizer before anyone ever used it we didn't delete it on application exit. This fix makes sure we do. Task: QTBUG-12845 Reviewed-by: Denis Dzyubenko
* Avoid unneeded additionThomas Zander2010-07-081-2/+2
| | | | Reviewed-By: Denis
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-06-071-0/+5
|\ | | | | | | 4.7-staging1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-031-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation: disable -no-feature-* for bootstrapped QString: Fix severals bugs when comparing with QStringRef QProgressBar: make accessors const. Changes: add patch for artificial emboldening Added static version of QGLFramebufferObject::release(). Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
| | * Add a new qconfig feature GESTURESTasuku Suzuki2010-06-021-0/+4
| | | | | | | | | | | | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | Fix a corner case where a gesture sometimes doesn't start.Thomas Zander2010-06-021-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | gestures are re-used per widget / recognizer and in the case of a gesture getting cancelled we sometimes didn't properly 'start' the gesture on new incoming events since the manager forgot to mark it as not running. Add a test case and a one line fix. Reviewed-by: Denis Task-number: QTBUG-11076
* | Reset gesture when in MayBeGesture state.Denis Dzyubenko2010-06-021-2/+6
|/ | | | | | | | When a gesture recognizer switches from MayBeGesture to Cancelled gesture we need to reset the state of the recognizer, but do not send any events to the user. Reviewed-by: Thomas Zander
* Removed the "maybe" timer from gesturemanager.Denis Dzyubenko2010-05-181-36/+6
| | | | | | | | | | | According to users of the api "maybe" timer (that is supposed to cancel gestures that have stayed in the "MaybeGesture" state for too long) is not useful and might even harm some gestures, so removing it completely and leaving it up to the author of a gesture recognizer to make sure the state machine is implemented properly. Task-number: QTBUG-9926 Reviewed-by: Thomas Zander
* Fixes a crash and a memory leak in gesturemanager.Denis Dzyubenko2010-05-181-1/+3
| | | | | | | | need to remove a QGesture object pointer from an internal hash when the widget/graphicsobject gets destroyed. Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
* Fixes a crash in QGestureManagerDenis Dzyubenko2010-05-051-0/+3
| | | | | | | | Work around the case when we reach QGestureManager indirectly from QGraphicsObject destructor. Task-number: QT-3262 Reviewed-by: Thomas Zander
* Fixes a crash when unregistering a recognizer.Denis Dzyubenko2010-05-051-4/+12
| | | | | | | | | | | Another fix for the same problem - we also need to be careful - when ungrabbing a gesture for the recognizer that has already been destroyed and cleaning up the QGesture object for it we need to make sure we know it is removed from the obsolete gestures list so that we won't delete it again in the QGestureManager detructor. Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
* Fixes a crash in QGestureManager when unregistering recognizers.Denis Dzyubenko2010-05-031-10/+10
| | | | | Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
* Dont use gestures if there is no touch screen.Denis Dzyubenko2010-03-041-1/+3
| | | | | | | | | If there is no touch input device attached on Windows7, we shouldn't even bother subscribing to native gesture events. Task-number: QTBUG-6007 Reviewed-by: Thierry Reviewed-by: Prasanth
* Fixes a crash when destroying and creating QApplication.Denis Dzyubenko2010-01-071-9/+0
| | | | | | | | Moved the gestureManager pointer to a QApplicationPrivate to make sure if QApplication object is destroyed, QGestureManager pointer is set to zero. Task-number: QTBUG-7029 Reviewed-by: Thiago
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Optimisations to gesture event filtering.Denis Dzyubenko2009-12-151-20/+22
| | | | | | | Now we don't filter some events through the gesture manager and use QMap instead of QHash, which seem to be a bit faster in our cases. Reviewed-by: Olivier Goffart
* Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-111-0/+1
|\ | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| * Fix warningsThierry Bastian2009-11-091-0/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Bradley T. Hughes2009-11-091-0/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qwidget_win.cpp
| * Merge branch 'feature' into 4.6Jørgen Lind2009-11-061-0/+2
| |\
| | * Fix QT_NO_GRAPHICSVIEWJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | Reviewed-by: paul
* | | Added a -no-native-gestures option for configure.exeDenis Dzyubenko2009-11-061-1/+3
|/ / | | | | | | | | | | | | | | The option allows to disable native Windows7 gestures since they require the creation of the native window handle. This partially disabled alien widgets concept and make window resizing slower and more flickery. Reviewed-by: Espen Riskedal
* | Implemented Tap and TapAndHold gestures.Denis Dzyubenko2009-11-051-1/+4
| | | | | | | | | | | | Added QGesture objects and gesture recognizers based on touch events. Reviewed-by: Bradley T. Hughes
* | Implemented QSwipeGesture recognizer using touch events.Denis Dzyubenko2009-11-051-0/+1
|/ | | | Reviewed-by: Bradley T. Hughes
* Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-38/+58
|\ | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| * Gesture api review.Denis Dzyubenko2009-11-031-17/+27
| | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| * Modified gesture events propagation.Denis Dzyubenko2009-11-031-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | By default if the gesture is ignored, only gestures in the started state are propagated, and accepting a gesture in the started state adds an implicit grab meaning all the following events in the gesture sequence will be delivered to that widget. This is similar to the way QTouchEvent is propagated. Also added a hint, which specifies if gestures in any state can be propagated to the widget which has enabled the hint. Reviewed-by: Thomas Zander
| * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-031-0/+6
| | | | | | | | Reviewed-by: trustme
| * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-031-0/+1
| | | | | | | | Reviewed-by: trustme
| * Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-301-22/+15
| | | | | | | | Reviewed-By: Denis
* | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-021-74/+216
|\ \ | |/
| * Replaced QMap with QHash where possible in the gesture manager implementation.Denis Dzyubenko2009-10-281-9/+9
| | | | | | | | | | | | There is no reason to use QMap when the key is a pointer. Reviewed-by: Thomas Zander
| * Delete all gesture objects and recognizers when gesture manager is deleted.Denis Dzyubenko2009-10-281-0/+5
| | | | | | | | | | | | | | When application closes and we haven't deleted the unregistered gestures and gesture recognizer, we should delete them. Reviewed-by: Thomas Zander
| * Fixed the gesture event filtering through multiple gesture recognizers.Denis Dzyubenko2009-10-281-23/+26
| | | | | | | | | | | | | | | | | | When there are several gesture recognizers registered for the same gesture type, we need to know which recognizer we need to get a state object for since those QGesture objects are tied to the recognizer that created them. Reviewed-by: Thomas Zander
| * Rename private member variables to begin with m_Thomas Zander2009-10-281-58/+58
| | | | | | | | Reviewed-By: TrustMe
| * Introduce QGesture::GestureCancelPolicy, a way to auto-cancel gesturesThomas Zander2009-10-281-4/+81
| | | | | | | | | | | | | | | | | | On accepting one gesture Qt can automatically cancel other gestures that belong to other targets. The policy is normally set to not cancel any other gestures and can be set to cancel all active gestures in the context. For example for all child widgets. Reviewed-By: Denis Dzyubenko
| * Implemented QGestureRecognizer::ConsumeEventHintDenis Dzyubenko2009-10-271-2/+4
| | | | | | | | Reviewed-By: trustme
generated by cgit v0.12 at 2024-09-18 22:27:46 (GMT)