[pitivi] Finalize layer removal in the Clutter timeline



commit 8ba98b98f7c9a24c7b02d729885e53ed579c7b59
Author: Mathieu Duponchelle <mathieu duponchelle epitech eu>
Date:   Thu Apr 18 07:07:41 2013 +0200

    Finalize layer removal in the Clutter timeline

 pitivi/timeline/layer.py    |    3 +--
 pitivi/timeline/timeline.py |    5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 5b06ba2..12f62bc 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -216,8 +216,7 @@ class BaseLayerControl(Gtk.VBox, Loggable):
         return True
 
     def _deleteLayerCb(self, widget):
-        timeline = self.layer.get_timeline()
-        timeline.remove_layer(self.layer)
+        self._app.timeline.bTimeline.remove_layer(self.layer)
 
     def _moveLayerCb(self, widget, step):
         index = self.layer.get_priority()
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 233184f..708c599 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -408,8 +408,8 @@ class TimelineStage(Clutter.ScrollActor, Zoomable):
         self._updatePlayHead()
 
     def _remove_layer(self, layer):
-        self._redraw()
         self._container.controls.removeLayerControl(layer)
+        self._redraw()
 
     def _add_layer(self, layer):
         self._redraw()
@@ -458,6 +458,9 @@ class TimelineStage(Clutter.ScrollActor, Zoomable):
 
     def _layerRemovedCb(self, timeline, layer):
         # FIXME : really remove layer ^^
+        for lyr in self.bTimeline.get_layers():
+            if lyr.props.priority > layer.props.priority:
+                lyr.props.priority -= 1
         self._remove_layer(layer)
         self._updatePlayHead()
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]