[pitivi] viewer: Use line design for overlay



commit 45a940cc9ec4ad417b8488dc11a535d662c4e76a
Author: Diego Garcia Gangl <dnicolas gmail com>
Date:   Fri Apr 19 21:53:31 2019 -0300

    viewer: Use line design for overlay

 pitivi/viewer/move_scale_overlay.py | 26 +++++++++++++++-----------
 pitivi/viewer/title_overlay.py      | 30 ++++++++++++++++++------------
 2 files changed, 33 insertions(+), 23 deletions(-)
---
diff --git a/pitivi/viewer/move_scale_overlay.py b/pitivi/viewer/move_scale_overlay.py
index 18d95d82..0cc3e9b6 100644
--- a/pitivi/viewer/move_scale_overlay.py
+++ b/pitivi/viewer/move_scale_overlay.py
@@ -555,24 +555,28 @@ class MoveScaleOverlay(Overlay):
             return
 
         cr.save()
-        # clear background
+
+        # Clear background
         cr.set_operator(cairo.OPERATOR_OVER)
-        cr.set_source_rgba(0.0, 0.0, 0.0, 0.0)
+        cr.set_source_rgba(0, 0, 0, 0)
         cr.paint()
 
-        if hovered:
-            brightness = 0.65
-        else:
-            brightness = 0.3
+        if not selected:
+            cr.set_dash((5, 5))
 
-        # clip away outer mask
-        self.__draw_rectangle(cr)
-        cr.clip()
-        cr.set_source_rgba(brightness, brightness, brightness, 0.6)
+        # Black outline around the box
+        cr.set_source_rgb(0, 0, 0)
+        cr.set_line_width(3)
         self.__draw_rectangle(cr)
+        cr.stroke()
 
-        cr.set_line_width(16)
+        # Inner white line
+        color = (0.8, 0.8, 0.8) if not selected else (1, 1, 1)
+        cr.set_source_rgb(*color)
+        cr.set_line_width(1)
+        self.__draw_rectangle(cr)
         cr.stroke()
+
         cr.restore()
 
         if selected:
diff --git a/pitivi/viewer/title_overlay.py b/pitivi/viewer/title_overlay.py
index b3516f14..71fd7a3c 100644
--- a/pitivi/viewer/title_overlay.py
+++ b/pitivi/viewer/title_overlay.py
@@ -130,26 +130,32 @@ class TitleOverlay(Overlay):
         self._commit()
 
     def do_draw(self, cr):
-        if not self._is_selected() and not self._is_hovered():
+        selected = self._is_selected()
+        hovered = self._is_hovered()
+        if not selected and not hovered:
             return
 
         cr.save()
-        # clear background
+
+        # Clear background
         cr.set_operator(cairo.OPERATOR_OVER)
-        cr.set_source_rgba(0.0, 0.0, 0.0, 0.0)
+        cr.set_source_rgba(0, 0, 0, 0)
         cr.paint()
 
-        if self._is_hovered():
-            brightness = 0.65
-        else:
-            brightness = 0.3
+        if not selected:
+            cr.set_dash((5, 5))
 
-        # clip away outer mask
-        self.__draw_rectangle(cr)
-        cr.clip()
-        cr.set_source_rgba(brightness, brightness, brightness, 0.6)
+        # Black outline around the box
+        cr.set_source_rgb(0, 0, 0)
+        cr.set_line_width(3)
         self.__draw_rectangle(cr)
+        cr.stroke()
 
-        cr.set_line_width(16)
+        # Inner white line
+        color = (0.8, 0.8, 0.8) if not selected else (1, 1, 1)
+        cr.set_source_rgb(*color)
+        cr.set_line_width(1)
+        self.__draw_rectangle(cr)
         cr.stroke()
+
         cr.restore()


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