aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use QWheelEvent instead of QGraphicsSceneWheelEventLars Knoll2011-07-077-28/+20
| | | | | | | | | | Since WheelEvent is not floating point based, we can use it instead of the graphics scene event. Change-Id: Ifa8411ca9c3a986ea311c8741f60213637b7c6ae Reviewed-on: http://codereview.qt.nokia.com/1140 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Squashed Particle System Stateful RewriteAlan Alpert2011-07-0639-1054/+2023
| | | | | | | | | | | | | | | | | | | | Add TargetAffector Fix for ParticlePainter offsets Adds a particleStates property to ParticleSystem Augment SpriteGoal to change system states as well Also add 'collidingParticles' list to affector. Particle Stochastic States Now actually working, and you can put emitters, affectors and painters inside their targeted state. Fireworks example uses states instead of delegates. Replaced the delegate example with a text thing. The examples launcher now also contains all the custom examples. Adds CumulativeDirection and working null Affector (for affected signal). Add spaces after all flow control keywords. Change-Id: I77b7e3044a9800dbfff6db833914d63127602cf5 Reviewed-on: http://codereview.qt.nokia.com/968 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Avoid crash on exitAlan Alpert2011-07-041-1/+1
| | | | | | | | | | QSParticlePainter could call QSGItem::mapFromItem while the scene was being destroyed. Change-Id: If9356dae6aadf97b853c2aaf51870751bbbab711 Reviewed-on: http://codereview.qt.nokia.com/1023 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones
* Fix compilationOlivier Goffart2011-07-011-4/+4
| | | | | | | | | qsgdefaultrectanglenode.cpp:221:22: error: narrowing conversion of '(((& c)->QColor::redF() * (&c)->QColor::alphaF()) * 2.55e+2)' from 'qreal {aka double}' to 'unsigned char' inside { } [-fpermissive] Change-Id: I4f051f07d5db28fd03739343c255cc72d968a99d Reviewed-on: http://codereview.qt.nokia.com/1004 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Support setting an FBO as the render target for a canvasGunnar Sletta2011-07-015-5/+60
| | | | | | | Change-Id: I8049580f1d2b27d6ebc4d595712939338c01b711 Reviewed-on: http://codereview.qt.nokia.com/986 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-302-7/+10
| | | | | | | | | | | | | | | | | | | | | | | This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a regression. When writing systems are mixed and an underline is set on the font, QPainter will set a pen with the current color and a new width on itself before drawing the decoration. This would cause the recorder in QStaticText to mark the pen as dirty, saving the current pen color in all subsequent text items. The effect was e.g. that in QML the cached color would override the current one, making it impossible to change the color on the text without forcing a relayout somehow. The right fix is to only mark the pen as dirty when its color actually changes. Task-number: QTBUG-20159 Change-Id: I0db1966787f543695bcba4a0c13328ae0a17625b Reviewed-by: Jiang Jiang Reviewed-on: http://codereview.qt.nokia.com/875 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Document threading issues with QSGEngine signalsGunnar Sletta2011-06-301-0/+7
| | | | | | | Change-Id: I769c0793929c4c90464f6e9fea46bd1a19fbacf3 Reviewed-on: http://codereview.qt.nokia.com/939 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Correct example snippet in QML positioner documentationAlan Alpert2011-06-301-3/+3
| | | | | | | | Task-number: QTBUG-19928 Change-Id: I0fd0f07525bbc1e08edaa636beee9f9ff4b8ad1b Reviewed-on: http://codereview.qt.nokia.com/869 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Clean up addTextDecorations codeJiang Jiang2011-06-292-33/+62
| | | | | | | | | Try avoid using QRawFont::fromFont since it requires shaping on Mac. Change-Id: I90cc177662ecf6d0a95e722cdd0b06a01e5d0eaa Reviewed-on: http://codereview.qt.nokia.com/793 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix UiPublicMember::lastSourceLocation.Christian Kamm2011-06-291-0/+2
| | | | | | | Change-Id: Ia2c13bf250b0b0e3d87ff7bd64a3bead1c26c1f0 Reviewed-on: http://codereview.qt.nokia.com/755 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Don't crash when QSGCanvas::sceneGraphContext() is called prematurlyGunnar Sletta2011-06-281-1/+1
| | | | | | Change-Id: Ib15814bbc095c1be87a8fcddb574444d5258afbb Reviewed-on: http://codereview.qt.nokia.com/813 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-stagingAaron Kennedy2011-06-24160-7188/+5093
|\ | | | | | | | | Conflicts: src/declarative/items/qsgtextnode.cpp
| * Updated tst_nodestest to use the DirtyForceUpdate flag.Kim Motoyoshi Kalland2011-06-233-6/+2
| | | | | | | | | | | | Changed test to use DirtyForceUpdate instead of DirtyAll, and removed DirtyRenderOrder and DirtyAll enums which should not be used.
| * Merge multiple lines of text into a single geometry nodeGunnar Sletta2011-06-233-19/+72
| | | | | | | | | | | | | | | | | | Long term, we might want to have this kind of logic in the QSGGeometry class through a grow() function or in the QSGRenderer, but we only have this one usecase where it actually makes sense right now, so I'm keeping it local. Change-Id: Ibbb0dd4a6e4b587154e26ffc2a34375fbb4a571d
| * Fix regression against 4.7Aaron Kennedy2011-06-231-0/+1
| | | | | | | | Task-number: QTBUG-19136
| * Correctly wait for render thread to exitAaron Kennedy2011-06-221-0/+7
| |
| * Make QSGCanvas::grabFrameBuffer() more reliableAaron Kennedy2011-06-221-2/+2
| |
| * Drag items relative to their scene position.Andrew den Exter2011-06-212-6/+11
| | | | | | | | | | This preserves the absolute position of a dragged item when its parent is changed.
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-211-0/+2
| |\ | | | | | | | | | into qtquick2
| | * Only print debugging when THREAD_DEBUG is enabledAaron Kennedy2011-06-211-0/+2
| | |
| * | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-2158-852/+1054
| |\| | | | | | | | | | into qtquick2
| | * Start out with a distance field cache that fits more charactersGunnar Sletta2011-06-201-2/+3
| | |
| | * Compile when qreal is not a doubleGunnar Sletta2011-06-201-2/+2
| | |
| | * Compile fix for MSVC.Kim Motoyoshi Kalland2011-06-202-3/+14
| | |
| | * Removed unnecessary calls to QSGNode::destroy().Kim Motoyoshi Kalland2011-06-203-14/+23
| | |
| | * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-06-204-3/+608
| | |\ | | | | | | | | | | | | into qtquick2
| | | * Add "DELETE" support to XMLHttpRequestAaron Kennedy2011-06-201-3/+6
| | | |
| | | * Add QDeclarativeChangeSet.Andrew den Exter2011-06-203-0/+602
| | | | | | | | | | | | | | | | | | | | | | | | Takes a sequence of model changes and reorders and compresses them so that like changes are grouped together and are ordered from start to end. The order is Removed, Inserted, Moved then Changed.
| | * | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-201-1/+36
| | |\ \
| | * \ \ Merge branch 'master' into qtquick2Gunnar Sletta2011-06-1551-813/+359
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec
| | * \ \ \ Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-06-151-1/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | into qtquick2
| | * | | | Renamed QMLRenderer -> QSGDefaultRendererGunnar Sletta2011-06-154-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb
| * | | | | Rewrite last rewriteAlan Alpert2011-06-2118-672/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rewrite to have all particle state shared, not just common elements.
| * | | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-161-1/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | into qtquick2
| | * | | | Remove annoying warningGunnar Sletta2011-06-151-1/+0
| | |/ / /
| * | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-153-0/+17
| |\| | | | | | | | | | | | | | | | | | into qtquick2
| | * | | Print out a warning when attributes are enabledGunnar Sletta2011-06-151-0/+15
| | | | |
| | * | | Disable attributes from shader effectsGunnar Sletta2011-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | * | | Initialize member variableGunnar Sletta2011-06-141-0/+1
| | | | |
| * | | | Rewrite particle system to cope with changing particle countsAlan Alpert2011-06-1517-388/+547
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | And might do it again... Caught up in this massive change were the following smaller ones: -Some custom particle examples -delegate property on ItemParticle and an example with it
| * | | Safer cleanup in model/item particleAlan Alpert2011-06-142-12/+14
| | | |
| * | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-1410-51/+120
| |\ \ \ | | | | | | | | | | | | | | | into qtquick2
| | * | | QDeclarativeDebug: Don't hang if started with ',block' argumentKai Koehne2011-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a59261454071 Reviewed-by: Christiaan Janssen (cherry picked from commit e3b5de8651586cf5484fd8ab217cddf17f0fe01e)
| | * | | QDeclarativeDebug: Fix QJSDebugService if launched with ',block'Kai Koehne2011-06-103-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the debugger is launched in blocking mode the service will be enabled from the start. Reviewed-by: Thorbjorn Lindeijer (cherry picked from commit c038e3505309bb954123493cb5f96c73e114f3d0)
| | * | | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-103-37/+24
| | |\ \ \
| | * | | | Disable vsync animations by defaultGunnar Sletta2011-06-103-13/+64
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed
| | * | | | Create property cache in case of Component{} rootAaron Kennedy2011-06-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4 Task-number: QTBUG-19354 (cherry picked from commit af1350249ea9de68e1c4b72ed1179948aa28ca19)
| * | | | | Add delegate property to ItemParticleAlan Alpert2011-06-105-28/+83
| |/ / / / | | | | | | | | | | | | | | | Also add burst(n,x,y) to ParticleEmitter, and a demo that uses both.
| * | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-0914-9/+956
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into qtquick2
| | * | | | Add a DragTarget element.Andrew den Exter2011-06-0913-8/+943
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides an area that can be used to handle events when other items are dragged over it. Task-number: QMLNG-32
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:36:26 +0000