aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
Commit message (Collapse)AuthorAgeFilesLines
* Expose QMatrix4x4 properties as mat4 uniforms in shadersChris Adams2012-11-221-0/+3
| | | | | | | | | | Previously, QMatrix4x4 properties were not exposed as uniforms in shaders. This commit adds conversion code for matrix 4x4 properties so that they are automatically converted to mat4 uniforms. Task-number: QTBUG-27952 Change-Id: I9b1de39fbbcb02743cf8c4e09b4d83c44f1dd438 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Ungrab mouse upon leave event.Frederik Gladhorn2012-11-211-0/+2
| | | | | | | | | | The event signals that the mouse has left the window. This happens also when a popup is shown (overlapping the original window). Before a mouse area would still think it was in pressed state when the popup (QWindow/QMenu) was shown and even after the popup was closed. Change-Id: I6d32571f5a473610f60e9476850989ff665edb93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-4/+4
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Jerome Pasion2012-11-0223-228/+179
| |\ | | | | | | | | | | | | | | | into newdocs Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
| * | doc: fix some typos.Alexandr Akulich2012-10-221-4/+4
| | | | | | | | | | | | | | | Change-Id: I951d89094a6d49e4c71aa9a50e98f3ccc1ca62e1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Allow margin changes during Flickable drag operationMatt Vogt2012-11-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the dimensions of the flickable were captured at mouse press and reused during dragging, which causes problems if the margins of the Flickable are altered during the drag. Adjust the captured values so that margin changes are correctly handled. Change-Id: I1ce608dcc1302ea8639bf18a81361b27749b217b Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Use threaded renderer even without BufferQueueingOpenGL.Samuel Rødal2012-11-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without threaded rendering QML 2 often ends up running at half the screen refresh rate on X11. Not having BufferQueuingOpenGL shouldn't prevent us from using threaded rendering, since the issue of four animating windows running at 1/4th of the screen refresh rate will happen regardless of whether rendering happens on the main thread or in a separate rendering thread. Change-Id: I0edc818e6d762fa1faf13e7f2f47dfda132b6fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Deduplicate checking of conditions.Alexandr Akulich2012-11-121-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I0621db17db2bb8fe885a3a65f6a7a042279c3752 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Preparation for changing QWindow::windowState to visibilityShawn Rutledge2012-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | QQuickWindow needs to avoid depending on QWindowPrivate::visible. It can go back to using private variables after the replacment is done. Change-Id: I38b99df8b4ef0139c9eadcbb07d33d3f1894a8ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Examples and fixes for QML Window propertiesShawn Rutledge2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting Window.color in QML takes effect immediately. It was only possible to set the property at startup. Examples demonstrate new Window property features. Change-Id: Ic5b43d0d84371f3fe5c42223ccc98e6de27aed10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Don't use design metrics with NativeRendering on TextInputEskil Abrahamsen Blomfeldt2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only set the design metrics property in init(), before the renderType has been set. Since updateLayout() is called every time the renderType changes, it should be sufficient to set it there. Change-Id: If5b2cb3738e8135195848857a30f4e646bdf1d0b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-081-8/+27
| | | | | | | | | | | | | | | | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Prevent crash when doing threaded rendering of multiple windows.Samuel Rødal2012-11-082-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call renderSceneGraph() on non-renderable windows. We also don't call syncSceneGraph() on them, which is where the renderer will be set. Also get rid of harmless warning about non-renderable windows. Change-Id: I24739abefe0d554efb568514057719f981590c28 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | qmlscene can start with either an Item or Window as the qml rootShawn Rutledge2012-11-052-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, it assumed that the root is an Item and needs to have a Window created. But it's useful for an application to have a Window as the root, and it was already possible by writing a different C++ main function (see qtdeclarative/examples/window/window/window.cpp). It doesn't take much to give qmlscene this flexibility too. Change-Id: Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | transformOriginPoint is deprecatedShawn Rutledge2012-11-051-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26423 Change-Id: I28f8160c2c52f62ef901ed569b94fefdab387729 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* | | Fix conditional jump based on an uninitialized value.Jędrzej Nowacki2012-11-021-1/+1
| |/ |/| | | | | | | | | | | | | QElapsedTimer is POD and it is not initialized by default. Change-Id: Ie6997e1c4225b9ba584de52cc0c9647f26e45438 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-293-6/+0
| | | | | | | | | | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Ib3a8e8eae98e2839c3db4bf34be8dcf43f49af11 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Change qml list interfaceMarco Bubke2012-10-233-22/+36
| | | | | | | | | | Change-Id: I185c6f4cef6105544504324c1616b5995c219fe3 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | Make Rectangle border be inner instead of centered on the outline.Samuel Rødal2012-10-223-50/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This avoids awkward situations such as when clipping to a parent item of the same size and makes it easier to reason about the bounding rectangle of the item. Task-number: QTBUG-21341 Change-Id: If015cfbc5792429f4a407fc0547ea71eca779eda Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Change Q_ASSERTs in qquick[threaded]windowmanager.cpp to qWarning().Friedemann Kleint2012-10-202-11/+22
| | | | | | | | | | | | | | | | | | As they also triggers when a non-existing file is loaded into QML2 or windows have invalid sizes. Change-Id: Iab1ce6c99f2bc2cb360ddaccce539cb97979ad5a Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | Fix QQuickTextInput::moveCursorSelection()Konstantin Ritt2012-10-191-5/+4
| | | | | | | | | | | | | | | | | | | | | | by using fixed QTextBoundaryFinder behavior. Update QQuickTextInput autotests. Task-number: QTBUG-11365 Change-Id: I81761c019e2fe80c9795fe54a2a990bfc5d4b709 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix list functions for the data propertyMarco Bubke2012-10-181-11/+27
| | | | | | | | | | | | | | | | The Qml Designer needs this functions. Task-number: QTCREATORBUG-8039 Change-Id: I6e072723630cf971ad3eda921497699611ae934e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QQuickItem: handle QEvent::StyleAnimationUpdateJ-P Nurmi2012-10-171-0/+3
| | | | | | | | | | Change-Id: Id5c4de6bdcd395a1e32449e69d773e9a35fab4c9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | QQuickScreen attached obj handles screenChanged and geometryChangedShawn Rutledge2012-10-162-7/+22
| | | | | | | | | | | | | | | | | | | | sizeChanged is replaced with geometryChanged. Given a Window, it also needs to connect to the Window's screenChanged signal. The result is that if the screen is changed after the QQuickView is created, the Screen attached object will be updated. Change-Id: I64473dd960376b861eb50e3e5a1a296d0030e766 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Remove interim compatibility measuresAlan Alpert2012-10-168-109/+46
| | | | | | | | | | | | | | | | Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* | Adding DesignerWindowManager for Qt Quick DesignerMarco Bubke2012-10-152-7/+17
|/ | | | | | | | | DesignerWindowManager implements a render path just for Qt Quick Designer, which is single threaded and does not open visible windows. Change-Id: I02b0d1b819a7a5391b9bb14ee6efa1a32e0c8ad7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix performance bottleneck in QQuickWindow::mouseMoveEvent().Sérgio Martins2012-10-113-8/+42
| | | | | | | | | | | | | | | | | | When a mouse move event is received, a lot of time is spent looking for items with cursors, recursively. With this patch, it will only recur into item hierarchies that contain cursors. Not having cursors is much more common than having them. Benchmark included: Before: 15 msecs per iteration (total: 62, iterations: 4) After: 0.000064 msecs per iteration (total: 68, iterations: 1048576) Task-number: QTBUG-27054 Change-Id: I3a5441652ca1c0b8d2cbc5683013562174f5af4a Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix emitting originYChanged signals even when originY wouldn't changeGabriel de Dietrich2012-10-032-2/+12
| | | | | | | | | | | Same for originXChanged. Conflicts: src/quick/items/qquickflickable.cpp src/quick/items/qquickflickable_p_p.h Change-Id: I1a316f326b924da4722b692cf27db48312fc9236 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Allow grabbing windows rendered without showing for testing.Balazs Kelemen2012-09-285-21/+24
| | | | | | | | | | | To make QQuickWindowPrivate::setRenderWithoutShowing more useful for autotesting we can allow grabbing such windows. This is safe if the platform window have been created and the window has a valid size. Change-Id: I8b9a2aaeb93935f662b75ef29651730b890441d5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Android also needs <ctype.h> for isspace() to be found.Samuel Rødal2012-09-251-1/+1
| | | | | Change-Id: Ic1299cd8949c37c6909b8d2ab36e930097335a4d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed missing virtual destructors in qtdeclarative.Samuel Rødal2012-09-242-0/+5
| | | | | | Change-Id: I0b0e63b572617a56874e27361479de2690644aa3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-23152-3652/+3652
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix Flickable movementEnded() signal emissionAndras Becsi2012-09-181-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the content was flicked horizontally so that the vertical position did not change handleMouseReleaseEvent performed a fixup for the vertical position to be an integer _before_ starting the horizontal flick. For some large content the rounding fixup had finished before the flicking animation started which resulted in a premature emission of the movementEnded() signal. This race condition did not affect vertical flicking because the vertical animation had always been started before the horizontal fixup was scheduled. The issue was revealed by QQuickWebView which above a certain velocity threshold locks the movement in one direction, thus produces the exact same vertical position throughout a horizontal pan gesture. This patch removes the race condition by starting the flick animation in either direction first then performing the position fixup if needed. There does not seem to be a reliable way to auto-test this. Change-Id: Idc8fb59b0a6ead71c6cfc7083a386d51048ec50c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix calculation of QML_RENDER_TIMING valuesThomas McGuire2012-09-102-4/+4
| | | | | | | | The sync time was not taken into account Change-Id: I3d8adb637572c72438e20729a80513850a80d17e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Alan Alpert <416365416c@gmail.com>
* QML_RENDER_TIMING: Add time since last frame to outputThomas McGuire2012-09-102-2/+10
| | | | | | | | | This is quite useful to see how much time the rest of the app takes. The same information has been available in QtQuick1. Change-Id: I31ae91bfa764a4d8013af80de9459514ed72314f Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add QML_RENDER_TIMING output for the single-threaded caseThomas McGuire2012-09-101-0/+22
| | | | | | Change-Id: Ia3958c7c26bf2fd9dd72a07fc6f5ff3a28b0a349 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use DEFINE_BOOL_CONFIG_OPTION for QML_RENDER_TIMINGThomas McGuire2012-09-101-5/+5
| | | | | | | | This makes it easier to grep for. Change-Id: I7630e05c4afddb4ab3ce1a7691466d7307325988 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* doc: fix some more typosSergio Ahumada2012-09-101-1/+1
| | | | | Change-Id: I7fa055049b9e5900d597754c6004febb153de12b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* doc: fix some typos in .cpp filesSergio Ahumada2012-09-078-10/+10
| | | | | Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Doc: Fix documentation issues.Kim Motoyoshi Kalland2012-09-074-26/+86
| | | | | Change-Id: I03c4faa1aee60cd1ad706cb6c1b983f03311d251 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fix typo in documentation.Sérgio Martins2012-09-061-1/+1
| | | | | Change-Id: I4d8d12cfce58e49789146639cc6734b6cf1643fa Reviewed-by: David Faure <faure@kde.org>
* Doc: Fix some documentation issues.Kim Motoyoshi Kalland2012-09-053-23/+2
| | | | | Change-Id: I0f7e60fd6060381bd8790dfaacc3a39a890a0fe7 Reviewed-by: aavit <qt_aavit@ovi.com>
* Remove windowmanager hacks form the incubation controller.Gunnar Sletta2012-09-045-60/+54
| | | | | | | | | | Tie incubation directly to wether animations are running or not. When animations are running, we incubate for a third of a frame only. When animations are not running we incubate whatever is left as the scene is anyway idle. Change-Id: I88c9248e9d7b3b35c99fca52aeb9c681d1b4a306 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix compiler warnings from MSVC2010Kai Koehne2012-08-281-2/+2
| | | | | Change-Id: I44eb0113374c221a166609c4fd29b5dad05ecc94 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Docs - add missing images and code, clean up sectionsBea Lam2012-08-281-1/+15
| | | | | | | | | | Includes the removal of concepts/modelviewsdata/localstorage.qdoc since that is a duplicate of the existing Local Storage module docs. Also removes classes from whatsnew.qdoc that are internal. Change-Id: I4170c1797bbec09bb67784b0b2ad67fd990365a8 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix various doc errorsBea Lam2012-08-281-6/+10
| | | | | | | | Also restore the main module "reference documentation" links added in 0e0f46c01cf6a183996d36c31987ca4a46b50bd9 Change-Id: I421f5a17e2946a2569537d8ba8a021f219aaf75a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Add cacheItemCount property to PathViewMartin Jones2012-08-285-60/+132
| | | | | | | | | | | | cacheItemCount specifies the number of items to cache off the path when pathItemCount is specified. This allows up to cacheItemCount items to be kept alive when they move off the path, and also to asynchronously create items off path in preparation for display when the path offset changes. This is the equivalent of cacheBuffer for other views. Task-number: QTBUG-23931 Change-Id: I03497537d3f929e5e3579536850dd43eb2724c38 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Update usage of smooth and antialiasing.Michael Brasser2012-08-284-29/+14
| | | | | | Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Improve docs related to visual parent conceptBea Lam2012-08-281-0/+10
| | | | | Change-Id: I73cc63c8a55cf949b94a2fa502cb331fb8adbda3 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Use the new antialiasing property for canvas paintingCharles Yin2012-08-289-29/+53
| | | | | Change-Id: I76f21d055696978f2f6936006eea038dd73cce6c Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 04:34:01 +0000