summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | Add missing effects.pri file in src/gui/effectsBjørn Erik Nilsen2009-08-201-0/+4
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Compile graphics effect on all platforms.Bjørn Erik Nilsen2009-08-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like we need to include graphicseffect.h even though it should have been included by the _p.h.
| | | * | | | | | | | | | | Header cleanup.Bjørn Erik Nilsen2009-08-201-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Graphics effects is no longer dependent of graphics view.
| | | * | | | | | | | | | | Make QGraphicsXXXEffect::boundingRectFor public.Bjørn Erik Nilsen2009-08-201-2/+2
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Graphics Effect cleanup: Remove old comments; not valid anymore.Bjørn Erik Nilsen2009-08-202-58/+4
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsEffect::ChangeFlags)Bjørn Erik Nilsen2009-08-201-0/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Compile graphics effect.Bjørn Erik Nilsen2009-08-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to include QColor and QRect rather than forward declare them.
| | | * | | | | | | | | | | Add QT_BEGIN_NAMESPACE and QT_END_NAMESPACEBjørn Erik Nilsen2009-08-201-0/+4
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add "QObject *parent = 0" to all graphics effect constructors.Bjørn Erik Nilsen2009-08-202-21/+21
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Cleanup after 19e01c93f9421a8db6c8a93ac103a7df2b93d9ecBjørn Erik Nilsen2009-08-192-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect is no longer dependent on the Graphics View module.
| | | * | | | | | | | | | | Move examples/graphicsview/blurpicker|lighting to examples/effects.Bjørn Erik Nilsen2009-08-1926-6/+17
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Make all graphics effect setters Q_SLOTS.Bjørn Erik Nilsen2009-08-191-7/+13
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add Q_PROPERTY to all qgraphics effects.Bjørn Erik Nilsen2009-08-192-2/+50
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Remove QGraphicsBloomEffect and QGraphicsFrameEffect.Bjørn Erik Nilsen2009-08-193-248/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These belong to the examples directory as discussed with Andreas.
| | | * | | | | | | | | | | Move QGraphicsEffect from src/gui/graphicsview to src/gui/effects.Bjørn Erik Nilsen2009-08-197-6/+5
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-19801-10151/+11783
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-178370-28824/+51048
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-072712-203483/+85633
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/auto.pro
| | | * | | | | | | | | | | | | | Make sure caches are invalidated whenever a QGraphicsItem changes visual ↵Bjørn Erik Nilsen2009-08-071-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appearance. QGraphicsScenePrivate::markDirty does not invalidate the cache, it only schedules a repaint. QGraphicsItem::update however, invalidates the cache and then calls markDirty. Reviewed-by: Andreas
| | | * | | | | | | | | | | | | | Fixes GCC compiler warning.Bjørn Erik Nilsen2009-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: suggest parentheses around assignment used as truth value
| | | * | | | | | | | | | | | | | Notify QGraphicsEffect whenever the source is invalidated.Bjørn Erik Nilsen2009-08-074-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of caching, the effect must be notified whenever the source has been invalidated; otherwise the cached pixmap will not be up-to-date. Auto-test included.
| | | * | | | | | | | | | | | | | Add ChangeFlags to QGraphicsEffect and pass flags to sourceChanged.Bjørn Erik Nilsen2009-08-074-31/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is way more flexible as it allows for extension in the future. Instead of having several virtual functions, which in most cases when re-implemented have to do exactly the same, we now have one virtual function which takes a ChangedFlags parameter do describe what kind of changes that occurred to the source.
| | | * | | | | | | | | | | | | | Fix wrong transform when applying multiple QGraphicsEffects.Bjørn Erik Nilsen2009-08-063-17/+27
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Wrong caching of QGraphicsItem::childrenBoundingRect.Bjørn Erik Nilsen2009-08-062-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot cache the bounding rect on the fly for children, because the bounding rect is mapped to the callee's local coordinate system. Auto-test included.
| | | * | | | | | | | | | | | | | First round of documentation for QGraphicsEffect.Andreas Aardal Hanssen2009-08-053-20/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discovered some weaknesses in the API; next round is to discuss and fix these. Reviewed-by: TrustMe
| | | * | | | | | | | | | | | | | Make tst_QGraphicsEffectSource::boundingRect happy.Bjørn Erik Nilsen2009-08-043-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot modify the transformPtr directly because we might want to use the original transform later. The problem in this particular case was that we called source->pixmap() (which modified the transformPtr), then source->boundingRect(Qt::DeviceCoordinates) which in turn used wrong transform to map the bounding rect.
| | | * | | | | | | | | | | | | | Make tst_QGraphicsEffectSource happy.Bjørn Erik Nilsen2009-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doh, storing a stale pointer is not a good idea ;)
| | | * | | | | | | | | | | | | | Add tests/auto/qgraphicseffectsource.Bjørn Erik Nilsen2009-08-043-0/+327
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Toggling QGraphicsEffect's enabled property does not update the source.Bjørn Erik Nilsen2009-08-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes tst_QGraphicsEffect::draw happy.
| | | * | | | | | | | | | | | | | Add tests/auto/qgraphicseffectBjørn Erik Nilsen2009-08-043-0/+356
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | More QGraphicsEffect API cleanup.Bjørn Erik Nilsen2009-08-043-30/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing some left over from previous experiments.
| | | * | | | | | | | | | | | | | Artifacts when moving a child when the parent has a graphics effect.Bjørn Erik Nilsen2009-08-043-8/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to use the effectiveBoundingRect() when finding out which items to repaint within a specific area. However, we don't want items to be clickable on the shadow, so we shouldn't use effectiveBoundingRect for normal item-lookup. Solution to this is to only use effectiveBoundingRect() in the BSP (used by estimateTopLevels) and in drawSubtreeRecursive. Auto-test included.
| | | * | | | | | | | | | | | | | Avoid painting on a null pixmap in QGraphicsShadowEffect.Bjørn Erik Nilsen2009-08-031-0/+2
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | QGraphicsItem leave traces when removing graphics effect.Bjørn Erik Nilsen2009-08-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to update the view directly when removing an effect; otherwise we have no information about the effective bounding rect and only the item's bounding rect will be updated.
| | | * | | | | | | | | | | | | | Infinite recursion in examples/graphicsview/customshaderBjørn Erik Nilsen2009-07-311-1/+1
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fixes QGraphicsEffect offset bugs.Bjørn Erik Nilsen2009-07-313-5/+6
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Compile examples/graphicsview/customshader.Bjørn Erik Nilsen2009-07-312-5/+5
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Notify QGraphicsEffect about source bounding rect changes.Bjørn Erik Nilsen2009-07-315-4/+15
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Compile fix.Bjørn Erik Nilsen2009-07-301-0/+1
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix offset bug in QGraphicsShadowEffect.Bjørn Erik Nilsen2009-07-301-4/+19
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Make sure we don't create pixmaps that are bigger than the device rect.Bjørn Erik Nilsen2009-07-305-2/+41
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Prevent potential QGraphicsEffect crashes.Bjørn Erik Nilsen2009-07-301-10/+17
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Small optimization to QGraphicsEffectSource::boundingRect.Bjørn Erik Nilsen2009-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't bother asking for the childrenBoundingRect if the item has no children.
| | | * | | | | | | | | | | | | | A few QGraphicsEffect optimizations.Bjørn Erik Nilsen2009-07-291-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all we shouldn't pass pixmap.rect() into the filter, we always want to draw the entire pixmap (without making a copy). We can also skip the filter entirely if the filter is effectively not doing anything.
| | | * | | | | | | | | | | | | | QGraphicsShaderEffect doesn't need to be a metatype any moreRhys Weatherley2009-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | | | | | | | | | Merge branch 'kinetic-graphicseffect' of ↵Bjørn Erik Nilsen2009-07-293-7/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects
| | | | * | | | | | | | | | | | | | Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-293-7/+7
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0eddBjørn Erik Nilsen2009-07-293-23/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes QGraphicsShaderEffect compatible with the new QGraphicsEffect API.
| | | * | | | | | | | | | | | | | | Merge branch 'kinetic-graphicseffect' of ↵Bjørn Erik Nilsen2009-07-29245-2336/+5476
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects Conflicts: src/gui/graphicsview/qgraphicseffect.cpp src/gui/graphicsview/qgraphicseffect_p.h
| | | | * | | | | | | | | | | | | | Improve GL filter performance by caching custom shader programs.Samuel Rødal2009-07-282-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings performance back up to where it was pre-merge.