[pitivi/ges: 4/287] Always show transitions' track objects on top



commit 62fad6d4d7d897f1a2aa715a30bb9cdcaa20e5ad
Author: Mathieu Duponchelle <seeed laposte net>
Date:   Tue Jul 19 20:45:18 2011 +0200

    Always show transitions' track objects on top

 pitivi/ui/track.py       |    3 ++-
 pitivi/ui/trackobject.py |    8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/pitivi/ui/track.py b/pitivi/ui/track.py
index 272f337..36583c8 100644
--- a/pitivi/ui/track.py
+++ b/pitivi/ui/track.py
@@ -65,6 +65,7 @@ class Track(goocanvas.Group, Zoomable):
         Zoomable.__init__(self)
         self.app = instance
         self.widgets = {}
+        self.transitions = []
         self.timeline = timeline
         self.track = track
         self.max_priority = 0
@@ -133,7 +134,7 @@ class Track(goocanvas.Group, Zoomable):
 
     def check(self, tr_obj):
         if tr_obj.get_timeline_object():
-            w = TrackObject(self.app, tr_obj, self.track, self.timeline)
+            w = TrackObject(self.app, tr_obj, self.track, self.timeline, self)
             self.widgets[tr_obj] = w
             self.add_child(w)
             self.app.gui.setBestZoomRatio()
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index 9e5e0cd..c287be6 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -240,12 +240,13 @@ class TrackObject(View, goocanvas.Group, Zoomable):
                 self._view.app.current.seeker.seek(Zoomable.pixelToNs(x))
                 timeline.setSelectionToObj(element, SELECT)
 
-    def __init__(self, instance, element, track, timeline, is_transition = False):
+    def __init__(self, instance, element, track, timeline, uTrack, is_transition = False):
         goocanvas.Group.__init__(self)
         View.__init__(self)
         Zoomable.__init__(self)
         self.app = instance
         self.track = track
+        self.uTrack = uTrack
         self.timeline = timeline
         self.namewidth = 0
         self.nameheight = 0
@@ -334,6 +335,9 @@ class TrackObject(View, goocanvas.Group, Zoomable):
         self.start_handle.props.visibility = goocanvas.ITEM_VISIBLE
         self.end_handle.props.visibility = goocanvas.ITEM_VISIBLE
         self.raise_(None)
+        for transition in self.uTrack.transitions:
+            print "transition raised"
+            transition.raise_(None)
 
     def unfocus(self):
         self.start_handle.props.visibility = goocanvas.ITEM_INVISIBLE
@@ -359,6 +363,8 @@ class TrackObject(View, goocanvas.Group, Zoomable):
             color = self.settings.audioClipBg
         else:
             color = self.settings.videoClipBg
+        if self.is_transition:
+            color = 0x0089CFF0
         pattern = unpack_cairo_gradient(color)
         self.bg.props.fill_pattern = pattern
 



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