diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:44:26 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:44:26 +0000 |
commit | 174afb43383ef0f0505be663ae4f18c7631df067 (patch) | |
tree | 0bc725ed8b3cd04332048a0586edf4bccf218308 /slideshow/source/engine/activities | |
parent | e0e68cd838ecced8ab203d4a7193944ac1f2049d (diff) |
INTEGRATION: CWS presfixes12 (1.9.12); FILE MERGED
2007/04/17 14:56:23 thb 1.9.12.2: #i37778# Calling commitUpdates() again after Activity::dequeued(), to make sure sprite state and static screen background are in sync
2007/03/05 13:47:08 thb 1.9.12.1: #i37778# Removed Activity::needsScreenUpdate() method - this is now handled by notifying ScreenUpdater explicitely; reorg of SlideShowImpl members, to align lifetime with mutual references; fixed (hopefully) last repaint issues with new LayerManager; added more tests
Diffstat (limited to 'slideshow/source/engine/activities')
-rw-r--r-- | slideshow/source/engine/activities/activitybase.cxx | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index 5858bc23e0d3..2d5b67bb69a1 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: activitybase.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:24:38 $ + * last change: $Author: obo $ $Date: 2007-07-17 14:44:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -108,34 +108,6 @@ namespace slideshow return mbIsActive; } - bool ActivityBase::needsScreenUpdate() const - { - // animations, while active, _do_ need screen updates - // after perform() calls. This is because - // e.g. SlideChanger internally uses XCustomSprites, - // which don't repaint by themselves. - // - // What is actually a feature, because then, the - // activities thread can issue synchronized repaints, - // updating all visible sprites at once. - - // FIXME(P1): - // Since by definition, the animation must not change the - // sprite when it is no longer active, we could possibly - // return true here only as long as mbIsActive is true. - // Unfortunately, the ActivitiesQueue asks for necessary - // screen updates after the perform calls, and this is a - // problem for the very last perform call of an activity - // (the one that ends the activity): this last one usually - // _does_ need a screen update, but has already set - // mbIsActive to false. I would consider delayed false returns - // here a hack, since it relies on call order. For the time - // being, we thus return true here, always (note that a - // finished Activity will normally be not queried for screen - // updates, anyway, since it's removed from the queues). - return true; - } - void ActivityBase::setTargets( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { @@ -174,7 +146,7 @@ namespace slideshow void ActivityBase::end() { - if (!mbIsActive || isDisposed()) + if (!isActive() || isDisposed()) return; // assure animation is started: if (mbFirstPerformCall) { @@ -184,9 +156,7 @@ namespace slideshow } performEnd(); // calling private virtual - endAnimation(); - endActivity(); } |