[pitivi] ui.trackobject.py: fix some rebasing mistakes



commit b2b0cb61d2d1751cf100ed9a6744b8665cdcf862
Author: Brandon Lewis <brandon_lewis berkeley edu>
Date:   Mon Jul 6 22:07:32 2009 -0700

    ui.trackobject.py: fix some rebasing mistakes

 pitivi/ui/trackobject.py |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index 9a01590..1771a68 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -99,13 +99,12 @@ class TimelineController(controller.Controller):
     def leave(self, unused, unused2):
         self._view.unfocus()
 
-    def drag_start(self, item, target, event):
-        pass
-
     def drag_end(self, item, target, event):
         self._view.timeline.rebuildEdges()
 
     def drag_start(self, item, target, event):
+        if not self._view.element.selected:
+            self._view.timeline.selection.setToObj(self._view.element, SELECT)
         tx = self._view.props.parent.get_transform()
         # store y offset for later priority calculation
         self._y_offset = tx[5]
@@ -113,9 +112,6 @@ class TimelineController(controller.Controller):
         self._mousedown = Point(self._mousedown[0], 0)
 
     def drag_end(self, item, target, event):
-        if not self._view.element.selected:
-            self._view.timeline.selection.setToObj(self._view.element, SELECT)
-
         self._context.finish()
         self._view.app.action_log.commit()
 



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