[pitivi] utils: Apply zoomratio limits before comparing it



commit 65b92de18722af32421515bff985060d1288cdf4
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Mon Nov 7 14:34:07 2016 +0100

    utils: Apply zoomratio limits before comparing it
    
    Reviewed-by: Thibault Saunier <tsaunier gnome org>
    Differential Revision: https://phabricator.freedesktop.org/D1454

 pitivi/utils/timeline.py |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/utils/timeline.py b/pitivi/utils/timeline.py
index a2092b7..bd1c0b8 100644
--- a/pitivi/utils/timeline.py
+++ b/pitivi/utils/timeline.py
@@ -356,9 +356,11 @@ class Zoomable(object):
 
     @classmethod
     def setZoomRatio(cls, ratio):
+        ratio = min(max(cls.min_zoom, ratio), cls.max_zoom)
         if cls.zoomratio != ratio:
-            cls.zoomratio = min(cls.max_zoom, max(cls.min_zoom, ratio))
-            cls._zoomChanged()
+            cls.zoomratio = ratio
+            for inst in cls._instances:
+                inst.zoomChanged()
 
     @classmethod
     def setZoomLevel(cls, level):
@@ -420,10 +422,5 @@ class Zoomable(object):
             return 0
         return ((float(duration) / Gst.SECOND) * cls.zoomratio)
 
-    @classmethod
-    def _zoomChanged(cls):
-        for inst in cls._instances:
-            inst.zoomChanged()
-
     def zoomChanged(self):
         pass


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