[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/animator-plugin-somsubhra] krita/ui: Show correct frame after frame deletion.
From:       Somsubhra Bairi <somsubhra.bairi () gmail ! com>
Date:       2014-06-30 18:59:35
Message-ID: E1X1gnf-00058X-68 () scm ! kde ! org
[Download RAW message or body]

Git commit e0baaa3f660c01aee8728449f861a8771a475099 by Somsubhra Bairi.
Committed on 30/06/2014 at 18:58.
Pushed by somsubhrabairi into branch 'animator-plugin-somsubhra'.

Show correct frame after frame deletion.

M  +6    -4    krita/ui/kis_animation_doc.cpp
M  +1    -1    krita/ui/kis_animation_doc.h

http://commits.kde.org/calligra/e0baaa3f660c01aee8728449f861a8771a475099

diff --git a/krita/ui/kis_animation_doc.cpp b/krita/ui/kis_animation_doc.cpp
index 19b723b..ff8912b 100644
--- a/krita/ui/kis_animation_doc.cpp
+++ b/krita/ui/kis_animation_doc.cpp
@@ -152,7 +152,7 @@ void KisAnimationDoc::loadAnimationFile(KisAnimation *animation, \
KisAnimationSto  emit sigImportFinished(timelineMap);
 }
 
-void KisAnimationDoc::frameSelectionChanged(QRect frame)
+void KisAnimationDoc::frameSelectionChanged(QRect frame, bool savePreviousFrame)
 {
     KisAnimation* animation = this->getAnimation();
 
@@ -161,8 +161,10 @@ void KisAnimationDoc::frameSelectionChanged(QRect frame)
         this->preSaveAnimation();
     }
 
-    // Dump the content of the current frame
-    d->kranimSaver->saveFrame(d->store, d->currentFrame, \
this->getParentFramePosition(d->currentFramePosition.x(), \
d->currentFramePosition.y())); +    if(savePreviousFrame) {
+        // Dump the content of the current frame
+        d->kranimSaver->saveFrame(d->store, d->currentFrame, \
this->getParentFramePosition(d->currentFramePosition.x(), \
d->currentFramePosition.y())); +    }
 
     QString location = "";
     bool hasFile = false;
@@ -365,7 +367,7 @@ void KisAnimationDoc::removeFrame(QRect frame)
 {
     this->deleteFrameFromXML(frame.x(), frame.y());
     this->saveXMLToDisk();
-    this->frameSelectionChanged(d->currentFramePosition);
+    this->frameSelectionChanged(d->currentFramePosition, false);
 }
 
 void KisAnimationDoc::addPaintLayer()
diff --git a/krita/ui/kis_animation_doc.h b/krita/ui/kis_animation_doc.h
index 118d983..44f6ee2 100644
--- a/krita/ui/kis_animation_doc.h
+++ b/krita/ui/kis_animation_doc.h
@@ -37,7 +37,7 @@ class KRITAUI_EXPORT KisAnimationDoc : public KisDoc2
 public:
     KisAnimationDoc();
     virtual ~KisAnimationDoc();
-    void frameSelectionChanged(QRect frame);
+    void frameSelectionChanged(QRect frame, bool savePreviousFrame=true);
 
     void addKeyFrame(QRect frame);
     void addBlankFrame(QRect frame);


[prev in list] [next in list] [prev in thread] [next in thread]