[pitivi] timeline: Get rid of some clip animations
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] timeline: Get rid of some clip animations
- Date: Wed, 24 Sep 2014 17:06:01 +0000 (UTC)
commit fb3f3da280fc6db0097379bccba815bc57a9c6c8
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Tue Apr 29 13:59:20 2014 +0200
timeline: Get rid of some clip animations
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=719348
pitivi/timeline/elements.py | 2 +-
pitivi/timeline/timeline.py | 19 +++++--------------
2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index 04b98c3..7e4b41b 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -556,7 +556,7 @@ class TimelineElement(Clutter.Actor, Zoomable):
# Interface (Zoomable)
def zoomChanged(self):
- self.update(True)
+ self.update(False)
if self.isSelected:
self.updateKeyframes()
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index c211b1c..75eddea 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -374,14 +374,9 @@ class TimelineStage(Clutter.ScrollActor, Zoomable, Loggable):
self.lastPosition = position
def _updatePlayHead(self):
- if self._project and self._project.pipeline.getState() != Gst.State.PLAYING:
- self.playhead.save_easing_state()
- self.playhead.set_easing_duration(600)
height = len(self.bTimeline.get_layers()) * (EXPANDED_SIZE + SPACING) * 2
self.playhead.set_size(PLAYHEAD_WIDTH, height)
self._movePlayhead(self.lastPosition)
- if self._project and self._project.pipeline.getState() != Gst.State.PLAYING:
- self.playhead.restore_easing_state()
def _movePlayhead(self, position):
self.playhead.props.x = self.nsToPixel(position)
@@ -425,7 +420,7 @@ class TimelineStage(Clutter.ScrollActor, Zoomable, Loggable):
self.elements.append(element)
- self._setElementX(element)
+ self._setElementX(element, ease=True)
self._setElementY(element)
self.insert_child_above(element, marker)
@@ -452,7 +447,7 @@ class TimelineStage(Clutter.ScrollActor, Zoomable, Loggable):
return element
return None
- def _setElementX(self, element, ease=True):
+ def _setElementX(self, element, ease=False):
if ease:
element.save_easing_state()
element.set_easing_duration(600)
@@ -623,20 +618,16 @@ class TimelineStage(Clutter.ScrollActor, Zoomable, Loggable):
def _elementStartChangedCb(self, unused_bElement, unused_start, element):
self._updateSize()
self.allowSeek = False
-
- if element.isDragged:
- self._setElementX(element, ease=False)
- else:
- self._setElementX(element)
+ self._setElementX(element)
def _elementDurationChangedCb(self, unused_bElement, unused_duration, element):
self._updateSize()
self.allowSeek = False
- element.update(False)
+ element.update(ease=False)
def _elementInPointChangedCb(self, unused_bElement, unused_inpoint, element):
self.allowSeek = False
- self._setElementX(element, ease=False)
+ self._setElementX(element)
def _layerPriorityChangedCb(self, unused_layer, unused_priority):
self._redraw()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]