aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
Commit message (Collapse)AuthorAgeFilesLines
* Reduce size of QQuickTextPrivateYann Bodson2012-03-012-100/+130
| | | | | | | Move less used members to an extra struct lazily allocated Change-Id: I87e464af4b9d29303705dd7e766f734309ed7763 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Make sure positioners remove change listeners for invisible items.Martin Jones2012-02-291-0/+5
| | | | | | | | Children that are invisble weren't having their change listeners removed, which showed illegal accesses on destruction in valgrind. Change-Id: Icae798e773168323781e9ab88b3dae6a5aea0952 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't round Text dimensions.Andrew den Exter2012-02-292-21/+22
| | | | | | | | | Painting issues in QtQuick1 meant drawing had to be aligned to pixel boundaries, since this is no longer a problem we should use qreal everywhere. Change-Id: I58e88e10270fa603170f1cedf471bfb53bd89b73 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Avoid unneccessary duplication of string data.Andrew den Exter2012-02-291-3/+11
| | | | | | | | | Check for the existence of new line characters before trying to replace them. There's some redundancy if the characters are found but for single line strings we avoid the detach in replace. Change-Id: I48ccc614601a6f356b3d2e68f617e112c100bbdd Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add generic "displaced" transition propertyBea Lam2012-02-296-52/+176
| | | | | | | | This is the default displaced transition that will be applied if addDisplaced, removeDisplaced or moveDisplaced are not specified (or are disabled). Change-Id: I9356036dc93bd9cb26e64e0b1769228113b74273 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Properly cleanup cancelled incubation.Martin Jones2012-02-281-2/+22
| | | | | | | Not all allocations were being destroyed. Change-Id: I2134bb224c58b947cfb990b0af2f6eedfd36da4a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Separate view transition functionality into new fileBea Lam2012-02-289-921/+1159
| | | | | | | | | | | | | | | | | | Move most of the view transition functionality from qquickitemview* into qquickitemviewtransition*. - Move QQuickViewTransitionAttached - Move QQuickItemViewTransitionManager, rename to QQuickItemViewTransitionJob - Move FxViewItem transition-specific features into new QQuickViewItem - Move transition-specific functions like transitionNextReposition() and canTransition() into QQuickItemViewTransitioner which holds all the transition objects now Also mention in docs that there's no defined order for choosing between multiple matching displaced transitions. Change-Id: I8701c0d40d2af152c5d432a4c8de646854c76ea2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename SpriteImage to SpriteSequenceAlan Alpert2012-02-286-51/+65
| | | | | | | Also rename Sprite::frames->Sprite::frameCount Change-Id: I2e7a71adc37044fd696ffda2a5da4835725ba3a8 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add AnimatedSpriteAlan Alpert2012-02-285-0/+991
| | | | | | | | A simpler sprite image element for the simple usecase. Because sometimes an engine with stochastic capabilities is overkill. Change-Id: I2b76c5d417719e92a548f6266bffd563dc016983 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Incubators are not async with the threaded renderer.Martin Jones2012-02-287-11/+50
| | | | | | | | | | | | | The threaded incubator relies on the event loop spinning to signal item updates. This change ensures that the event loop is processed while items are being created and that the render loop is woken if it is sleeping. Also cancel delegate incubation correctly during destruction. Change-Id: Ib5bb55c788411490e0959c75933da587fdfd4b8c Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Correctly set duration and easing for AnchorAnimation.Michael Brasser2012-02-281-0/+2
| | | | | | Task-number: QTBUG-24532 Change-Id: I3aad9cd8281b954896c2c1d44b2dcae68f913928 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Force to send defer deletion events before deleting QQuickCanvasCharles Yin2012-02-271-0/+1
| | | | | | | | Also change the assert in QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate() to a warning message. Change-Id: Ic1fb7e0b7ffe4a54458a0f3a65127b1afd6dda53 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Don't create a separate section header for currentItemMartin Jones2012-02-274-63/+75
| | | | | | | | | | The currentItem FxViewItem contained it's own section item, which when created would cause the current item delegate to be repositioned. This change associates the section item with the delegate item, via the attached object. Change-Id: Ie675d545539b56d0f1cf5a9b4ea26668978a5e72 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Revert resource releasing logic inside window managers.Gunnar Sletta2012-02-242-117/+39
| | | | | | | | | | | | | This was based on the assumption that exposure and visibility would take similar code paths, but this is not the case and the fallout of this change (like not releasing resources at all) is not worth it. This reverts ef6318ae38322b5a4a0619b581924290f114fa74 and most of 5f0013ee76605b9c7ceab168702b57e797b698e0 Change-Id: Ib2e29972502a8ec956cd6bd294a2a2bb50d8e76e Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Use floating point types for position offsets and cursorRectangle.Andrew den Exter2012-02-246-49/+46
| | | | | | | | | Rounding to align painting to pixel boundaries is no longer necessary are largely removed. Correct the few instances remaining in TextEdit and TextInput. Change-Id: Ic6ec57092d74ec43b23d85cd8868e0190acc3e09 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Use new plugin system in QtDeclarative.Friedemann Kleint2012-02-231-1/+3
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Clean up some of the view transition docsBea Lam2012-02-232-66/+72
| | | | | | | Fix some of the wording in the docs. Change-Id: I07892bec06c78b73bdd93926719d609405e263b3 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix for bad operator precedence causing right mouse button issuesAlex Wilson2012-02-231-2/+2
| | | | | | | | | | | Binary or (|) has higher operator precedence than a ternary in C, causing the original expression here to function quite incorrectly for anything other than the common left-mouse-button-only case. I just added brackets -- feel free to change this to "if"s if you think that would more clearly avoid this issue in future. Change-Id: Ie20bd7e805b89a393794d3240fb0ae680b29ff64 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix Text eliding with implicit height and maximumLineCount.Andrew den Exter2012-02-231-2/+4
| | | | | | | | Ignore the height of the text if the element height is invalid. Task-number: QTBUG-24293 Change-Id: I1646c3f64583da40e6166aeea24c2c4af42cb279 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Fix font size calculation in headings in StyledText.Yann Bodson2012-02-232-3/+13
| | | | | | | | | | | Calculate the font size correctly even when the size is specified in pixels and update this size when the font changes. Also make sure that the text layout's font is set before parsing. Task-number: QTBUG-24458 Change-Id: Ida7723f6e4f4b9fd3a6878076f4beaf5bda8f7f7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Reduce QQuickTextEdit memory usage.Andrew den Exter2012-02-235-199/+84
| | | | | | | | | Remove unnecessary members from QQuickTextEditPrivate and QQuickTextControlPrivate and re-order and pack to reduce padding for alignment. Change-Id: I14f5e3fc01646d02745f095c2a4b168cd675745d Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Positioners cleanupAlan Alpert2012-02-223-88/+100
| | | | | | | | Use qreal for positions and spacing instead of ints, and make the positionedItems list take care of filtering out invisible items. Change-Id: Icad93ad89c848e40a70bd7a9539bd810e27020df Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Doc improvements for positionersBea Lam2012-02-221-220/+161
| | | | | | | | | | | - Fix docs that say opacity changes can trigger an add transition since this is no longer the case - Be more clear about when the move transition is applied - Be more clear about which anchors are allowed/disallowed in which positioners - Add example to Positioner attached property Change-Id: I78417ac5b8eba1af5587955121b7fd4e2ca21169 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Whitespace fixes for positionersAlan Alpert2012-02-222-23/+23
| | | | | Change-Id: I53a8a023e218cd41b2c01a7c931c95edfbaee780 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Reduce the size of QQuickTextInputPrivate.Andrew den Exter2012-02-223-110/+69
| | | | | | | | Remove some redundant or obsolete member and reorder members to minimise padding for alignment. Change-Id: I2660007baa07bea076e9ad307061af87c07e37cf Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Reduce size of QQuickItemPrivateAaron Kennedy2012-02-216-304/+361
| | | | | Change-Id: I02653536f68cfef3dfc06acaf30e2565a97dc194 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Release resources on shutdown..Gunnar Sletta2012-02-211-3/+11
| | | | | Change-Id: I7758f5ba1f58e19d92e394133cccd449ce5a1756 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Flicking a pathview with large delegate spacing is inconsistentMartin Jones2012-02-212-11/+67
| | | | | | | | | | | | The deceleration is inconsistent and dragging slowly is jerky. This was largely due to the poor resolution of the path points. pointAt() now interpolates, and the dragging logic is more accurate. Also removed the rounding of item positioning so that side-by-side items don't bounce around. Task-number: QTBUG-24312 Change-Id: I956aff0b83c3c1211d5657159c3de1e4ef0b5171 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix condition check against wrong variableBea Lam2012-02-211-1/+1
| | | | | Change-Id: I0857166e666e886077e4b0eda2d8b00b13f99ba6 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Reduce the size of QTextPrivate.Andrew den Exter2012-02-213-83/+91
| | | | | | | | Remove some unnecessary members, store colors as QRgb values instead of QColor, and reorder members to minimise alignment padding. Change-Id: Id3958429008c97a5714734a529250fe881e2161b Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* cacheBuffer makes delegates appear briefly in wrong positionMartin Jones2012-02-211-0/+2
| | | | | | | | | Set delegates that are created asynchronously to non-visible. This would have happened the next time addVisibleItems() was called. Task-number: QTBUG-24364 Change-Id: I4b628bef186c8c41bd6a4d9e4ac402d59bcb4972 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove the callback facility from context node.Justin McPherson2012-02-213-33/+3
| | | | | | | | | | | - It's not really necessary. - It's probably a mis-use of QSGNode::preprocess() - Because it triggers a race between object deletion in the main thread and preprocess() in the render thread. Change-Id: I51433f508db306aab53398f8c3d1d8c9d9e986fd Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix gcc compiler warnings.Friedemann Kleint2012-02-211-1/+2
| | | | | | Change-Id: I22d0a45bdcf68c454af0aab9fa62dd2d126d63c2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Make compile.Michael Brasser2012-02-212-0/+2
| | | | | | | Fix compile after 054114a459580b71e170dc6bf356e8943d0ed068 in qtbase. Change-Id: Ibeea6b4b2e3c5f420446b15edd1df7bf88535dcd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove commit headersAaron Kennedy2012-02-2053-53/+0
| | | | | | | | These were used when we were porting from QtQuick 1 to QtQuick 2 but are no longer necessary. Change-Id: I0eeb7e13b4affdd6ab6c6dddea760afcdf38ee4f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix Screen::AngleBetweenAlan Alpert2012-02-202-3/+6
| | | | | | | | | | | Enum values in invokables don't worry currently, so use ints. Also AngleBetween is no longer static, so it has to be initialized before the function can be used. Change-Id: I4a6748fef6920bab6f08f22ce68911c3af6ce821 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Use an enum rather than a string to represent state event types.Michael Brasser2012-02-203-10/+10
| | | | | Change-Id: Iad230b610f35b1c1faa6ce60615551f293d4745d Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Improve test coverage for AnchorChanges.Michael Brasser2012-02-201-7/+0
| | | | | Change-Id: If6d62febed093a07d75a6125a920aac628c35e54 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Take QDeclarativeTransition::enabled() into accountBea Lam2012-02-174-51/+61
| | | | | | | Don't run transitions if enabled() is false Change-Id: I1df5479f8415b12837df8d54aa3902e072c73037 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add velocity data to TouchPointMichael Brasser2012-02-172-0/+20
| | | | | Change-Id: I0555b3ad41e8c08563188e1ba9190e54d4bb3784 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Have input method hints on only classes using themPekka Vuorela2012-02-179-34/+40
| | | | | | | | | | | Removed inputMethodHints setter and getter from QQuickItem. No need to consume memory for input method hints on every item when only QQuickTextInput and QQuickTextEdit actually use them. Additionally introduced change signals on the editor hint properties. Change-Id: Ice380d4f4dd47fdde73d2468f4a44a7d1540ad45 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Avoid an unnecessary layout when eliding text.Andrew den Exter2012-02-172-22/+62
| | | | | | | | Query the elided text from the initial layout rather than doing a second layout of the line to be elided. Change-Id: I399f99a11046013c0c51add2e2f2dd14b959831a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Check pending changes before they are reset, not afterBea Lam2012-02-171-3/+3
| | | | | | Change-Id: Ibe295741ee323522b98e4fd834f61053f9053e1f Reviewed-by: Martin Jones Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Provide visual debugging for MouseArea and TouchAreaYann Bodson2012-02-174-0/+48
| | | | | | | | | Display MouseAreas and TouchAreas as semi transparent rectangles when the environment variable QML_VISUAL_TOUCH_DEBUGGING is set. Task-number: QTBUG-24283 Change-Id: Iec8482a79ed1d4b802c29a5f7104af4e0a6eab7d Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QtDeclarative/Quick: Fix warnings.Friedemann Kleint2012-02-161-1/+1
| | | | | Change-Id: I71bd638fcc41356e0b76df27ec76ad3ed5ef90d9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Ensure visibility changes are communicated through itemChange.Michael Brasser2012-02-162-6/+2
| | | | | | | Also added MouseArea test that depends on this functionality. Change-Id: I1c303504ffd63d6b9dbdf95ab63e8426dc09c02d Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Built-in transition support for ListView & GridViewBea Lam2012-02-166-139/+2046
| | | | | | | | | | | | | | | | | ListView and GridView can now be assigned transitions to be run when: - Populating the view (when initially setting the model / resetting) - Adding items - Removing items - Moving items The ViewTransition attached object can be used from within a transition declaration to access various information about the items that are being transitioned. Task-number: QTBUG-21504 Change-Id: Ie5c75ea511c8b15acc3f06fccf19abe34d3677f9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix multi-length string substitution.Andrew den Exter2012-02-162-7/+27
| | | | | | | | | | Multi-length string eliding was provided by QFontMetrics::elidedText() which is no longer used for layouts. So we instead have to do the string substitution ourselves if the text doesn't fit before finally eliding. Change-Id: Iab2e54b332390290d656299a5be148f39f78df9d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow binding the size of a Loader to its item.Martin Jones2012-02-161-1/+3
| | | | | | | | | | | If the size of the Loader is bound to the item, the item was resized before the binding was evaluated, resulting in an item height of 0. This change allows bindings to the item to be evaluated before we apply the resize logic. Task-number: QTBUG-22628 Change-Id: I30acdb54214b422a9d4aa4e7e02a0af3674322db Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Introduced QQuickCanvas::releaseResources().Gunnar Sletta2012-02-154-27/+129
| | | | | | | | This function can be used in certain situations to purge the texture cache and triggers more lazily to take down the scene graph and GL context Change-Id: Icd9360ff50fda0e721ba0f1b520cda678e457a35 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>