summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativepathview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-101-16/+28
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView items were not correctly updated when rootIndex changed. Allow text to selected in a TextEdit or TextInput inside a Flickable.
| * PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-101-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | PathView got confused because it queried the model when removing items due to the rootIndex change. This caused new items to be added since the model->count() was not zero (it was the count for the new rootIndex). Calculate the PathView modelCount similarly to the other views (rather than querying the model) and correctly handle the modelCount being set to zero. Change-Id: I9e4fb27c14aa8c77ad37ff01d95c123f909db20d Task-number: QTBUG-16366 Reviewed-by: Bea Lam
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix auto test failure. PathView regression: dragging the path didn't update currentIndex Fix docs for variant and list basic types Add test for importing plugins that contain QML files Call onAdd() for first items added to ListView and GridView Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master. Don't clear pre-edit text when a graphics items loses focus.
| * PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | Some refectoring while fixing QTBUG-13687 resulted in the private setOffset() method being called rather than the public. The public version was responsible for updating currentIndex. Change-Id: Iac9c7a19d6fa64550b9498e77b8983512e199370 Task-number: QTBUG-17319 Reviewed-by: Michael Brasser
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211-3/+16
|\ \ | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| * | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-1/+1
| |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-061-1/+3
| | | | | | | | | | | | | | | | | | If the model is a VisualDataModel, the count will initally be zero and modelCount is not updated due to itemsInserted() before the component is completed. Task-number: QTBUG-16357 Reviewed-by: Bea Lam
| * Improve docs on attached properties on view delegates.Martin Jones2010-12-231-0/+9
| | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
| * Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-231-1/+3
| | | | | | | | | | Task-number: QTBUG-16133 Reviewed-by: Bea Lam
* | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-211-7/+7
|/
* PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-101-1/+1
| | | | | | | | Removing the currentIndex could result in currentIndex being > than the number of items in the model. Task-number: QTBUG-15926 Reviewed-by: Michael Brasser
* Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-161-0/+1
| | | | | | | | PathView needed to update internal item count when delegate was set. VDM::count() didn't call into the internal VDM when querying count. Task-number: QTBUG-14781 Reviewed-by: Alan Alpert
* Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| | | | Task-number: QTBUG-15073
* Fix PathView key navigation docs.Martin Jones2010-11-121-1/+15
| | | | | Task-number: QTBUG-15222 Reviewed-by: Yann Bodson
* Ensure increment/decrementCurrentIndex always move items in the correct ↵Martin Jones2010-11-121-9/+21
| | | | | | | | | | direction. With < 4 items the shortest distance algorithm doesn't work since it is equal distance either way. Task-number: QTBUG-15260 Reviewed-by: Yann Bodson
* Run util/normalize on src/declarative.Yann Bodson2010-10-261-2/+2
|
* Fix dragging items within a PathViewMartin Jones2010-10-071-3/+3
| | | | | | | | | The test to determine whether the mouse had moved greater than startDragDistance() compared the starting point on the path to the current mouse position. Fix to compare nearest path position. Task-number: QTBUG-14220 Reviewed-by: Michael Brasser
* Fix setting PathView offset when all visible items are removed.Martin Jones2010-10-071-0/+2
| | | | | | | | If we remove all items then we don't have a valid firstIndex with which to anchor item positions, so just use offset. Task-number: QTBUG-14199 Reviewed-by: Michael Brasser
* Ensure PathView updates positions when path changes.Michael Brasser2010-10-061-2/+15
| | | | | | | | Fixes regression caused by optimization added in commit 35a51442ed21f58c06b21293eeb56e843251ee82. Task-number: QTBUG-14239 Reviewed-by: Martin Jones
* PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-171-75/+108
| | | | | | | | | | | Since it didn't accept the press it didn't get a grab, so its events were always filtered away by Flickable. Use the same implementation as Flickable, i.e. create private handler functions for mouse events and accept normal events in the mouse*Event() methods. Task-number: QTBUG-13687 Reviewed-by: Michael Brasser
* Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-171-3/+5
| | | | | | | | Check that we no longer hold a reference to the item before setting onPath to false. Task-number: QTBUG-13689 Reviewed-by: Michael Brasser
* Doc: More work on the declarative API documentation.David Boddie2010-09-131-2/+2
|
* Fix PathView item position on insertion and removal.Martin Jones2010-09-061-125/+160
| | | | | | | Ensure the offset is adjusted to account for the new or removed items. Also minor optimizations to delegate updates. Task-number: QTBUG-13416
* Fix PathView when setting an empty model that is later filled.Michael Brasser2010-08-241-1/+2
| | | | | Task-number: QTBUG-13017 Reviewed-by: Martin Jones
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | ...and a set of functional group pages.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-101-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits) Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" Doc: Fixed typo. Doc: Fixed QML documentation errors. Doc: Merged in some of Thomas Zander's suggestions. Doc: Fixed name clash. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-041-5/+114
| |\ | | | | | | | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc
| * | Doc: Fixed QML documentation errors.David Boddie2010-07-161-3/+3
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
| |/ |/| | | | | | | | | | | Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell
* | Add missing imageBea Lam2010-07-301-1/+1
| | | | | | | | Task-number: QTBUG-12529
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-291-1/+4
|\ \
| * | Document elements that are focus scopes.Yann Bodson2010-07-291-1/+4
| | | | | | | | | | | | Task-number: QTBUG-12404
* | | Add moving and flicking properties to PathViewMartin Jones2010-07-291-1/+107
|/ / | | | | | | | | | | | | | | | | | | PathView handles its own mouse interaction, but lacked properties similar to those in Flickable to determine when it is stationary. This made it impossible to start an animation when the view stops moving, for example. Task-number: QTBUG-12497 Reviewed-by: Warwick Allison
* | Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105Martin Jones2010-07-191-2/+2
|/ | | | | | | | | | | Always place PathView delegates centered on the path The scale of the delegate was used to offset the item. This was a bad way of making the item appear to be positioned correctly when the default transform origin was the top-left. Now that transform origin is center, it is obvious that it was a bad idea. Task-number: QTBUG-12245 Reviewed-by: Michael Brasser
* docsBea Lam2010-07-071-0/+4
|
* doc: note that calling methods before component completion may have no effectMartin Jones2010-06-231-0/+4
| | | | So use Component.onCompleted:
* Document attached propertiesBea Lam2010-06-101-0/+7
|
* Ensure PathView mappedRange is updated when pathItemCount changes.Martin Jones2010-06-031-0/+1
|
* Doc fixes and improvements - fix some example code, link toBea Lam2010-06-021-1/+11
| | | | examples from class docs and improve assorted docs
* Use QElapsedTimer rather than QTime::elapsed()Martin Jones2010-05-281-5/+5
|
* If a pathview delegate changes size, reposition center on pathMartin Jones2010-05-271-0/+15
| | | | Task-number: QTBUG-11006
* Add an example spinner.Martin Jones2010-05-131-2/+31
| | | | | Also add missing increment/decrementCurrentIndex() slots to PathView, and tweak the number of points cached along a Path.
* Ensure PathView "attribute" attached properties are created correctlyMartin Jones2010-05-111-12/+30
| | | | | | | | If an item was created spontaneously (i.e. delegate is a package and some other view created the item), ensure its attached properties are correctly initialized. Task-number: QTBUG-10527
* qdoc fixesYann Bodson2010-05-061-2/+2
|
* Document delegate life cycle.Martin Jones2010-05-051-1/+5
| | | | Task-number: QTBUG-10353
* docWarwick Allison2010-05-051-4/+4
| | | | Task-number: QTBUG-10386
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-301-1/+6
|\
| * Fix assert in qdeclarativepathviewLeonardo Sobral Cunha2010-04-301-1/+6
| | | | | | | | | | Task-number: QTBUG-10327 Reviewed-by: Martin Jones
* | Avoid regenerating PathView delegates needlesslyMartin Jones2010-04-301-2/+6
|/