[pitivi] timeline: Always show a 1px width handle on the elements
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] timeline: Always show a 1px width handle on the elements
- Date: Thu, 11 Jun 2015 09:19:24 +0000 (UTC)
commit 864b02e1a034fff6675163a1c21c16fa5066be18
Author: Thibault Saunier <tsaunier gnome org>
Date: Mon May 18 11:50:47 2015 +0200
timeline: Always show a 1px width handle on the elements
So that we can easily see clip boundaries.
Make sure to hide them completely when we are on keyframes so that
they never hide keyframes:
Fixes http://phabricator.freedesktop.org/T59
pitivi/timeline/elements.py | 19 ++++++++-----------
pitivi/utils/ui.py | 2 +-
2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index 1d38c0b..8cfc47c 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -355,7 +355,7 @@ class TimelineElement(Gtk.Layout, timelineUtils.Zoomable, Loggable):
def do_get_preferred_width(self):
wanted_width = max(
- 0, self.nsToPixel(self._bElement.props.duration) - TrimHandle.DEFAULT_WIDTH * 2)
+ 0, self.nsToPixel(self._bElement.props.duration) - TrimHandle.SELECTED_WIDTH * 2)
return wanted_width, wanted_width
@@ -495,7 +495,8 @@ class TrimHandle(Gtk.EventBox, Loggable):
__gtype_name__ = "PitiviTrimHandle"
- DEFAULT_WIDTH = 5
+ SELECTED_WIDTH = 5
+ DEFAULT_WIDTH = 1
def __init__(self, clip, edge):
Gtk.EventBox.__init__(self)
@@ -506,7 +507,7 @@ class TrimHandle(Gtk.EventBox, Loggable):
self.edge = edge
self.props.valign = Gtk.Align.FILL
- self.props.width_request = 5
+ self.props.width_request = TrimHandle.DEFAULT_WIDTH
if edge == GES.Edge.EDGE_END:
self.props.halign = Gtk.Align.END
else:
@@ -517,12 +518,6 @@ class TrimHandle(Gtk.EventBox, Loggable):
def _windowSetCb(self, window, pspec):
self.props.window.set_cursor(CURSORS[self.edge])
- def do_show_all(self):
- self.info("DO not do anythin on .show_all")
-
- def do_get_preferred_width(self):
- return TrimHandle.DEFAULT_WIDTH, TrimHandle.DEFAULT_WIDTH
-
def do_draw(self, cr):
Gtk.EventBox.do_draw(self, cr)
Gdk.cairo_set_source_pixbuf(cr, GdkPixbuf.Pixbuf.new_from_file(os.path.join(
@@ -682,10 +677,12 @@ class Clip(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
def _eventCb(self, element, event):
if event.type == Gdk.EventType.ENTER_NOTIFY and event.mode == Gdk.CrossingMode.NORMAL:
ui.set_children_state_recurse(self, Gtk.StateFlags.PRELIGHT)
- self.__showHandles()
+ for handle in self.handles:
+ handle.props.width_request = TrimHandle.SELECTED_WIDTH
elif event.type == Gdk.EventType.LEAVE_NOTIFY and event.mode == Gdk.CrossingMode.NORMAL:
ui.unset_children_state_recurse(self, Gtk.StateFlags.PRELIGHT)
- self.__hideHandles()
+ for handle in self.handles:
+ handle.props.width_request = TrimHandle.DEFAULT_WIDTH
return False
diff --git a/pitivi/utils/ui.py b/pitivi/utils/ui.py
index 282b751..c2f2062 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -116,7 +116,7 @@ TIMELINE_CSS = """
.Trimbar {
background-image: url('%(trimbar_normal)s');
- opacity:0.7;
+ opacity:0.5;
}
.Trimbar:first-child {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]