| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
For PathView, ListView does this already.
Task-number: QTBUG-19059
Change-Id: Id09087ad372e46661794b0cb15cb30fc88802c4b
Reviewed-on: http://codereview.qt.nokia.com/2330
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The ShaderEffectItem was renamed to ShaderEffect to be consistent
with other QML element names. The GLSL uniform variable
qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is
easier to type and remember. The GridMesh element was removed.
The mesh resolution is now specified simply with a QSize.
To make the transition easier, the old API will continue to work
for some time, but will output warnings if used. Eventually, I
will remove the old API completely.
Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a
Reviewed-on: http://codereview.qt.nokia.com/2270
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bounding rect varies from width/height in some cases, like Rectangle.
This restores rectangle clipping behaviour to be the same as QtQuick 1.
Task-number: QTBUG-20547
Change-Id: I2b6edc662a0026219d73b52878d2f4c046fef7f0
Reviewed-on: http://codereview.qt.nokia.com/2317
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-19527
Change-Id: I7cba15cc8ca4679d92f2e456ed95629702ea27a1
Reviewed-on: http://codereview.qt.nokia.com/2322
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Shouldn't set moveReason=SetIndex in key navigation. ListView didn't
do this in its keyPress implementation.
Added extra tests for GridView and ListView.
Task-number: QTBUG-20408
Change-Id: Iaf0f331d3ba4f037c5bbc0a41418dd656b5a3695
Reviewed-on: http://codereview.qt.nokia.com/2318
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the new 1st item becomes the currentItem after removal
it was positioned incorrectly because the currentItem is positioned
based on visibleIndex, which was updated after the currentItem
was updated. Move visibleIndex update before currentItem update.
Change-Id: Iaf92a41eefe7bce093e3000d17f5496dba144bcd
Fixes: QTBUG-20575
Reviewed-on: http://codereview.qt.nokia.com/2316
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Committed by accident but slipped through the cracks somehow.
Change-Id: I64f172e5615de439987438b9300077e79503174e
Reviewed-on: http://codereview.qt.nokia.com/2135
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To fix backward movements, all backward movements are now flipped
into forward movements (as is done in ListModel implemenation).
Movement of multiple items wasn't working as views weren't removing
the right indexes in these cases.
Task-number: QTBUG-19208
Change-Id: I9866ddabc241c066bb77329a6761d500d79aaf61
Reviewed-on: http://codereview.qt.nokia.com/2262
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
Also make QDeclarativeOpenMetaObjectType zero its engine when the engine
dies, because this was leading to problems when the scene wasn't
deleted. Also fixes a few other potential deletion problems.
Change-Id: I37fa2d1a0b438a6ea7d8cf4c5c9d0bd869faa959
Reviewed-on: http://codereview.qt.nokia.com/2250
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Remove them all. endPosition() etc. now refer to the position() +
size() rather than position() + size() - 1.
Change-Id: I6ddf98def39971ee2e2c3c2d0a1df97781290782
Fixes: QTBUG-20020
Reviewed-on: http://codereview.qt.nokia.com/2243
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The view position was alternating between the start and end
of the highlight range if the range < delegate size. Now
favor the range start in this case, as per StrictlyEnforceRange.
Change-Id: Icb895f972ccb9598ecf7238259093584c43ae291
Fixes: QTBUG-18067
Reviewed-on: http://codereview.qt.nokia.com/2226
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Don't create a duplicate modelData property if one has already been
created from the model's roles.
Task-number: QTBUG-18801
Change-Id: Ic46763a9dc067cfb53b0655d991c553b3b10f023
Reviewed-on: http://codereview.qt.nokia.com/2312
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The cursor is allowed to exceed the boundaries of a TextInput so that
the text alignment is consistent with the Text element and the bounding
rect of TextInput is expanded to allow for that. To avoid clipping
the contentSize also needs to be expanded, and the horizontal scrolling
should be calculated against the non-expanded size.
Task-number: QTBUG-18818
Change-Id: I09e3a7aff9c2e8a333e8a3f9796683563b3e124a
Reviewed-on: http://codereview.qt.nokia.com/2242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a move happened after a contentY change but before a refill, the
position of the first visible item wasn't calculated correctly.
If the first item from visibleItems was above the content start
position and a move operation caused the items below it to move
away, this first item was not being moved to the correct position
(i.e. above the next available visible item) causing the following
visible items to be positioned incorrectly on the next refill.
ListView supported this previously but only adjusted positioning for
items before the content position, instead of for all moved items.
Fixed for both ListView and GridView and added more move-related tests.
Task-number: QTBUG-20528
Change-Id: I2ba1a2f5e49f790e694c6e1486f649f10d09c256
Reviewed-on: http://codereview.qt.nokia.com/2261
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Usually if item 0 moves down, the next item becomes the first visible
item and all content moves down. Don't do this if another item is
moving up to take its place.
Change-Id: If625cfc0eaa70fd1094c7bc0fdd29f5f56766a42
Reviewed-on: http://codereview.qt.nokia.com/2260
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number:QTBUG-20523
Change-Id: I6ff71c12ffb66407cc5bbb4783e4c957ab740ac7
Reviewed-on: http://codereview.qt.nokia.com/2068
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I38442c8d2bcb9f2dcaa433b6bcfd7dbc21439f63
Reviewed-on: http://codereview.qt.nokia.com/1907
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I0bf55c13e55856dd7292e5eda159086096dea86b
Reviewed-on: http://codereview.qt.nokia.com/2158
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-19726
Change-Id: I896c9264c1cf408dcd533b5d6d463d53c785d787
Reviewed-on: http://codereview.qt.nokia.com/2155
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-19684
Change-Id: Iea7d4a4f902cc45cb0cca8e1221fdb993f0bebd2
Reviewed-on: http://codereview.qt.nokia.com/2151
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Only resize view to object in SizeRootObjectToView if the view
has not had a size set, i.e. at initial construction.
Change-Id: Ic5ad3cbb3b071c3498047be893da2c7bf0957986
Fixes: QTBUG-15863
Reviewed-on: http://codereview.qt.nokia.com/2132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-12940
Change-Id: Id637bbd7c30aea8bc23c2aeaccfb069a8de7955f
Reviewed-on: http://codereview.qt.nokia.com/2082
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This signal was meant to be "private" (not directly used from QML).
Provide separate signals for onMouseXChanged and onMouseYChanged.
Task-number: QTBUG-18656
Change-Id: Iefc3d78e270db9c037bbb1b890925b4841f2d5fa
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/2142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-20078
Change-Id: I095a872d72da61248794ec4a2a85f91ee618cdbc
Reviewed-on: http://codereview.qt.nokia.com/2063
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Improves consistency with TextEdit.
Task-number: QTBUG-18747
Change-Id: Ieb0a332441557fc6ba4c5ddaafea5c634aff1ee4
Reviewed-on: http://codereview.qt.nokia.com/2131
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Emit textChanged() before adjusting size and scroll positions otherwise
the calculations will be based on the cursor position before it's moved
in handler and because the cursor position won't ultimately have changed
there won't be a follow up cursorPositionChanged() signal to trigger a
second set of calculation.
Task-number: QTBUG-19912
Reviewed-by: Martin Jones
(cherry picked from commit bb11b53bedb8e239b9439b4a3fc3320e35c2de57)
Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
Change-Id: I579bc3fe6c80766dfadfbc9dbd46144607bf7b03
Reviewed-on: http://codereview.qt.nokia.com/2058
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
Apply 452e13b5407fa4c36f9a573c305d41f551762b93 to scene graph items.
Task-number: QTBUG-19089
Change-Id: I4501bdc940cbac9ba2ef068b87ded83b1c86976f
Reviewed-on: http://codereview.qt.nokia.com/2054
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
GridView should call layout() not layoutVisibleItems() in
setCellWidth(), setCellHeight() and itemsMoved()
Bug introduced when refactoring view code into QSGItemView.
Change-Id: I48bc63c0a08c10c005bf45a2a7902cb01632cbf9
Reviewed-on: http://codereview.qt.nokia.com/1726
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously headers were either positioned at 0 if there were no items in
the view, or at (0 - headerSize) if items were present. With this fix
they are always positioned at (0 - headerSize) to be consistent.
Due to the change, setPosition(-headerSize()) is now called from
componentCompleted() to ensure the header is visible.
This change also fixes GridView's header and footer positioning in
TopToBottom + RightToLeft mode.
Also added extra tests for header and footer positioning and fixed
incorrect test value in tst_QSGGridView::positionViewAtIndex() (was 460
instead of 430 because previously rowPosAt() always added the header
size, so if positionViewAtIndex() jumped past all visible items and
caused them to be released, the new items started at +headerSize()
instead of 0).
Change-Id: I1015bed457d4ae964a7fb13702e2dfc470a168a9
Reviewed-on: http://codereview.qt.nokia.com/1618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
lastPosition() returns the end position of the last item so it should
always include a -1 calculation for the last item (as
FxListItemSG::endPosition() and FxGridItemSG::endPosition() do) to get
the last edge pixel of the item. With this fix, both views now
calculate startPosition() and endPosition() in the same way.
This also fixes positioning of GridView items in TopToBottom+RightToLeft
layouts. Incorrect test values in positionViewAtIndex_rightToLeft()
test are fixed (the last edge of a 1-pixel border shouldn't be visible,
since the bottom edge of a 1-pixel border is actually drawn outside,
not inside, the Rectangle).
Change-Id: I253c3836f871c61e13c08f67007ebc75e09378d6
Reviewed-on: http://codereview.qt.nokia.com/1547
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I77a7af006e1c0264365ae6d93bf78416f8b38a62
Reviewed-on: http://codereview.qt.nokia.com/1686
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Places common code into QSGItemView.
Change-Id: Ic310dbe7e16774163ba393860da64a0da7d4ea0a
Reviewed-on: http://codereview.qt.nokia.com/1200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I11ea38fc87373604debd469e03af3447b8adcecb
Reviewed-on: http://codereview.qt.nokia.com/985
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Id00868bd0ea93010912f06fba67624fb325ecc41
Reviewed-on: http://codereview.qt.nokia.com/1818
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: Id2e8ccf6441ce7e7a2bcdd6f0d50745e7d9ba653
Reviewed-on: http://codereview.qt.nokia.com/1750
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
If a complex transform exists, it needs to be applied whenever there
are relevant changes (TransformUpdateMask), and not just when the
transform changes (ComplexTransformUpdateMask).
Change-Id: I395f6bed02a671b23dcb5d4ccb3be204d4bafd82
Reviewed-on: http://codereview.qt.nokia.com/1793
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I1cfae5fb57025372789391632bac4cb97b8450dc
Reviewed-on: http://codereview.qt.nokia.com/1684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- add Image.Pad as a fillMode
- add horizontal and vertical alignment properties
Task-number: QTBUG-18291
Change-Id: Iaaf3b2d02c47ad01d2c8b49d146f1a9401b2558d
Reviewed-on: http://codereview.qt.nokia.com/1468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1. Only allow the context API calls inside onPaint() slot function,
makes the context2d handle invalid when out of scope.
2. requestPaint() method supports region parameter
3. Emit paint() signal in updatePolish() function to allow
threaded scene graph rendering work properly with context2d api
4. Allow request painting mutiple dirty regions between 2 frames.
5. Add svgpath for context2d
Change-Id: I5ec48f7c0eb6820d5c9c16a8d0dcc0aae8d0fd2f
Reviewed-on: http://codereview.qt.nokia.com/1465
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h
Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/qml/qdeclarativevme.cpp
Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f
|
| | |
| | |
| | |
| | | |
Change-Id: I8dadcb292b5c99d5f520672ab02db3490b21e8fa
|
| | |
| | |
| | |
| | | |
Change-Id: I97a26c6c5273ba8800b13ca5f1f994eff04a24b8
|
| | |
| | |
| | |
| | | |
Change-Id: I6b815f58c1d96e88fe9b592515bf62b749011b8e
|
| |\ \
| | | |
| | | |
| | | | |
into v8
|