summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-202-0/+4
| | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam
* Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-142-15/+0
| | | | Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
* Remove active selection when TextEdit loses focusJoona Petrell2010-12-142-0/+15
| | | | | Task-number: QTBUG-15341 Reviewed-by: Yann Bodson
* Ensure ListView contentHeight is set to a valid size.Martin Jones2010-12-131-0/+6
| | | | | | | | | If the view height is 0 no items will be created so the contentHeight can not be estimated. The currentItem is usually created, so it is possible to use that to estimate. Task-number: QTBUG-16037 Reviewed-by: Bea Lam
* Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
| | | | | | | | Change 810e21d9e404aa2fcb602cb68bfd892387b234e7 caused regression. Once stealMouse is set to true is must stay that way until release. Task-number: QTBUG-15998 Reviewed-by: Michael Brasser
* A QAIM model resulted in items moving to incorrect locationsMartin Jones2010-12-131-1/+1
| | | | | | | | | QAbstractItemModel moves items to the gaps between items. QML views assume items are moved to the destination index. This means we need to adjust the destination when moving forward to a gap. Task-number: QTBUG-15841 Reviewed-by: Michael Brasser
* 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
* Improvements to anchoring docsBea Lam2010-12-091-0/+2
| | | | | Make it clear that anchor margins only apply to anchors. Also document that anchor and absolute positioning cannot be mixed.
* Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-091-3/+7
|\ | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def
| * Don't emit activeFocusChanged() unless the active focus actually changedTor Arne Vestbø2010-12-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would previously call subFocusItemChanged(0) on the item as part of clearing the subfocus, even if the item in question would recieve a new subfocus item as part of setting the new subfocus. This resulted in the declarative item emitting activeFocusChanged(false) and then activeFocusChanged(true), which was affecting any animation or state bound to the activeFocus property of the item. We now stop clearing the subfocus when encountering an item that we know will get subfocus during the set-subfocus pass. We then set subfocus all the way to the root item, since the subfocus item itself might change. The effect of this is that the declarative item will only get one call to subFocusItemChanged(), passing the new subfocus item, instead of two. This means the declarative item can keep track of wherther ot not it had a subfocus item previously, and only emit activeFocusChanged() when the active focus goes from true to false or false to true. Task-number: QTBUG-15615 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-092-11/+21
| | | | | | | | | | | | | | | | In some cases ListView and GridView would position the highlight despite highlightFollowsCurrentItem: false being specified. Task-number: QTBUG-15972 Reviewed-by: Michael Brasser
* | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-081-4/+8
| | | | | | | | | | | | | | | | The calculation of position of currentItem when it is out of the visible area was bogus. Task-number: QTBUG-15525 Reviewed-by: Bea Lam
* | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-061-0/+1
| | | | | | | | | | | | | | | | | | A function resetCursorBlinkerTimer was introduced to QLineControl. Each time the cursor position in a textInput is updated, the blinker timer is reset. Task-number: QTBUG-15815 Reviewed-by: Martin Jones
* | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
|/ | | | Task-number: QTBUG-15802
* Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
* Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | | | | The margins could overlap, which caused overpainting. Ensure the margins are always <= width or height /2. Task-number: QTBUG-14657 Reviewed-by: Yann Bodson
* Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| | | | | Task-number: QTBUG-15250 Reviewed-by: Martin Jones
* ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| | | | | | | | | If the header size was not set explicitly, but determined implicitly from Text height, the view was not positioned so that the header was visible when first shown. Task-number: QTBUG-15599 Reviewed-by: Bea Lam
* Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8
| | | | Task-number: QTBUG-14568
* Fix BorderImage painting at sizes less than margin size.Martin Jones2010-12-011-2/+18
| | | | | | | | | | If the width < left+right margins or height < top+bottom margins the image was painted with the complete margins, resulting in an ugle pattern. This change reduces the size of the margins proportionately, which gives a much better appearance. Task-number: QTBUG-15736 Reviewed-by: Yann Bodson
* Ensure header is considered when positioning content with snapping.Martin Jones2010-11-302-17/+26
| | | | | | | | | When snapping is enabled the header was ignored and content would be aligned with the first item rather than the header, when at the top of the view. Task-number: QTBUG-15710 Reviewed-by: Bea Lam
* Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| | | | | Task-number: QTBUG-15694 Reviewed-by: Martin Jones
* Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-1/+1
| | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
* Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-51/+21
|
* Repaint when text color changesAlan Alpert2010-11-261-5/+6
| | | | | Task-number: QTBUG-15623 Reviewed-by: Yann Bodson
* End painting of Rectangle pixmap before inserting it to pixmap cache to ↵Joona Petrell2010-11-251-0/+8
| | | | | | | avoid an unnecessary copy Task-number: QTBUG-15534 Reviewed-by: Martin Jones
* Document KeyEvent::modifiersBea Lam2010-11-251-1/+29
| | | | Task-number: QTBUG-15569
* Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-242-19/+34
| | | | | | | | | This meant that they would sometimes act upon a drag immediately, rather than waiting for a nested area to take the grab. This resulted in a short jump before future events were handled by the nested item. Task-number: QTBUG-15568 Reviewed-by: Bea Lam
* Avoid lockup in ListView when animating delegates.Martin Jones2010-11-241-0/+8
| | | | | | | | | | Animating delegates results in the content height changing, which may result in fixup being called if at the ends of the view, which may in turn cause refill to be called, which will change the content height, which repeats. Prevent this recusion from happening. Task-number: QTBUG-14821 Reviewed-by: Bea Lam
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-191-0/+7
|\
| * Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-192-1/+5
|\ \ | |/
| * Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| | | | | | | | | | | | | | | | 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
| * VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-161-0/+2
| | | | | | | | | | | | | | There are no visual items if there is no delegate. Task-number: QTBUG-14781 Reviewed-by: Robert Griebl
| * Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| | | | | | | | Task-number: QTBUG-15073
* | Doc: Documented that border width does not affect rectangle geometry.David Boddie2010-11-191-0/+3
|/ | | | Task-number: QTBUG-15458
* ListView: items with size < 1.0 were layed out incorrectly.Martin Jones2010-11-151-3/+3
| | | | | | | | If the size of an item was less than one its endPosition() was less than its position(), which caused incorrect layout (overlapping items). Task-number: QTBUG-15242 Reviewed-by: Yann Bodson
* ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.Martin Jones2010-11-151-34/+20
| | | | | | | | | The bounds behavior with ListView.StrictlyEnforceRange enabled should not be affected by snapping behavior in fixup() since ListView.StrictlyEnforceRange has a stronger positioning policy. Task-number: QTBUG-15329 Reviewed-by: Michael Brasser
* 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-122-10/+24
| | | | | | | | | | 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
* Ensure loaded item's parent is set before component completion.Martin Jones2010-11-121-6/+35
| | | | | | | Also documented Loader sizing behavior. Task-number: QTBUG-14873 Reviewed-by: Michael Brasser
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-111-0/+14
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Keep source information when changing an expression Flickable does not reposition its content when it is resized.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-103-18/+28
| |\
| * | Flickable does not reposition its content when it is resized.Martin Jones2010-11-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Call fixup() after Flickable resize to ensure contents are within bounds. Task-number: QTBUG-15173 Reviewed-by: Bea Lam
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-101-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Fixed tst_qpixmap::grabWidget autotest failure on QWS. Doc: Fixing typo Doc: Fixing typo Doc: Fixing typo Fixed tst_qwidget::testContentsPropagation auto-test failure. Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-081-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-051-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-011-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-291-2/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | | * | Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QStaticTextItem held an uncounted reference to QFontEngine. The pointer would dangle in some cases where there was no font object referencing the engine and the cache was cleaned out (e.g. when a new application font is added.) Properly count the reference, and also add reference counting to userData to make it harder to shoot yourself in the foot, since the QStaticTextItem class is now being used in different places, Task-number: QTBUG-14446 Reviewed-by: Martin Jones