Merge lp:~tintou/wingpanel-indicator-sound/gresource into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Corentin Noël]

* Add image_mask to gresource
* Create image_mask with gtk.overlay instead of cairo composite

[lp:~tintou/wingpanel-indicator-sound/gresource]

136. By Corentin Noël on 2016-12-19

Use its own vector assets

[Danielle Foré (danrabbit)]

Just a small issue here. It looks like the mask is always applied, even when using the default music player icon ;)

review: Needs Fixing

[lp:~tintou/wingpanel-indicator-sound/gresource]

137. By Corentin Noël on 2016-12-21

Use overlay instead of hardcoded pixbufs

=== added file 'cmake/GResource.cmake'
--- cmake/GResource.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GResource.cmake	2016-12-21 23:45:45 +0000
@@ -0,0 +1,67 @@
+#
+#    Copyright (C) 2013 Venom authors and contributors
+#
+#    This file is part of Venom.
+#
+#    Venom is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Venom is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Venom.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+FIND_PROGRAM(GLIB_COMPILE_RESOURCES_EXECUTABLE NAMES glib-compile-resources)
+MARK_AS_ADVANCED(GLIB_COMPILE_RESOURCES_EXECUTABLE)
+
+INCLUDE(CMakeParseArguments)
+
+FUNCTION(GLIB_COMPILE_RESOURCES output)
+  CMAKE_PARSE_ARGUMENTS(ARGS "" "SOURCE" "" ${ARGN})
+  SET(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  SET(out_files "")
+
+  FOREACH(src ${ARGS_SOURCE} ${ARGS_UNPARSED_ARGUMENTS})
+    SET(in_file "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+    GET_FILENAME_COMPONENT(WORKING_DIR ${in_file} PATH)
+    STRING(REPLACE ".xml" ".c" src ${src})
+    SET(out_file "${DIRECTORY}/${src}")
+    GET_FILENAME_COMPONENT(OUPUT_DIR ${out_file} PATH)
+    FILE(MAKE_DIRECTORY ${OUPUT_DIR})
+    LIST(APPEND out_files "${DIRECTORY}/${src}")
+
+    #FIXME implicit depends currently not working
+    EXECUTE_PROCESS(
+      COMMAND
+        ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+          "--generate-dependencies"
+          ${in_file}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE in_file_dep
+    )
+    STRING(REGEX REPLACE "(\r?\n)" ";" in_file_dep "${in_file_dep}")
+    SET(in_file_dep_path "")
+    FOREACH(dep ${in_file_dep})
+      LIST(APPEND in_file_dep_path "${WORKING_DIR}/${dep}")
+    ENDFOREACH(dep ${in_file_dep})
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${out_file}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      COMMAND
+        ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+      ARGS
+        "--generate-source"
+        "--target=${out_file}"
+        ${in_file}
+      DEPENDS
+        ${in_file};${in_file_dep_path}
+    )
+  ENDFOREACH(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS})
+  SET(${output} ${out_files} PARENT_SCOPE)
+ENDFUNCTION(GLIB_COMPILE_RESOURCES)

=== added file 'data/image-mask.svg'
--- data/image-mask.svg	1970-01-01 00:00:00 +0000
+++ data/image-mask.svg	2016-12-21 23:45:45 +0000
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       id="ButtonShadow-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)">
+      <stop
+         id="stop3750-3"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-1"
+         style="stop-color:#000000;stop-opacity:0.58823532"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3174-4"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3176-5"
+         stdDeviation="1.71" />
+    </filter>
+    <linearGradient
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       id="ButtonShadow"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)">
+      <stop
+         id="stop3750-9"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-7"
+         style="stop-color:#000000;stop-opacity:0.58823532"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3174"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3176"
+         stdDeviation="1.71" />
+    </filter>
+    <linearGradient
+       xlink:href="#ButtonShadow-9"
+       id="linearGradient6176"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396" />
+    <linearGradient
+       xlink:href="#ButtonShadow"
+       id="linearGradient6178"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0058652,0.994169)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396" />
+    <linearGradient
+       id="linearGradient3688-464-309-9-2-4-2">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2889-7-9-6-9" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2891-6-6-1-7" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.1578952,0,0,0.6428571,-3.78948,16.2857)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3702-501-757-8-4-1-1-9"
+       id="linearGradient6084"
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096" />
+    <linearGradient
+       id="linearGradient3702-501-757-8-4-1-1-9">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2895-8-9-9-1-4" />
+      <stop
+         offset="0.5"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2897-7-8-7-7-3" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2899-4-5-1-5-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,1)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3924-1-7-54"
+       id="linearGradient3028-82"
+       y2="43"
+       x2="23.99999"
+       y1="4.999989"
+       x1="23.99999" />
+    <linearGradient
+       id="linearGradient3924-1-7-54">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3926-3-4-4" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop3928-91-41-8" />
+      <stop
+         offset="0.95056331"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop3930-6-6-6" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop3932-6-6-7" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(2.3201719,0,0,0.89999994,28.617841,5.0999865)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309-9-2-4-2"
+       id="radialGradient3013-3"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+    <radialGradient
+       gradientTransform="matrix(-2.3201719,0,0,-0.89999994,19.382168,83.399981)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3688-464-309-9-2-4-2"
+       id="radialGradient3015-3"
+       fy="43.5"
+       fx="4.9929786"
+       r="2.5"
+       cy="43.5"
+       cx="4.9929786" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(906.27272,-451.79544)"
+     style="display:none"
+     id="layer2">
+    <rect
+       style="opacity:0.9;fill:url(#linearGradient6178);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)"
+       id="rect3745"
+       y="7"
+       x="5"
+       ry="6"
+       rx="6"
+       height="85"
+       width="86" />
+  </g>
+  <g
+     transform="translate(903,-452.15908)"
+     style="display:none"
+     id="layer2-4">
+    <rect
+       style="opacity:0.9;fill:url(#linearGradient6176);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174-4)"
+       id="rect3745-5"
+       y="7"
+       x="5"
+       ry="6"
+       rx="6"
+       height="85"
+       width="86" />
+  </g>
+  <rect
+     width="37"
+     height="37"
+     rx="1"
+     ry="1"
+     x="5.5"
+     y="6.4999828"
+     id="rect6741-11-6"
+     style="opacity:0.4;fill:none;stroke:url(#linearGradient3028-82);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     width="39"
+     height="39"
+     rx="2"
+     ry="2"
+     x="4.5"
+     y="5.4999828"
+     id="rect5505-21-3-2-7-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect4188"
+     d="M 7.7890625 45 L 7.7890625 46.5 L 40.210938 46.5 L 40.210938 45 L 7.7890625 45 z "
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient6084);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0" />
+  <path
+     id="rect2801-3"
+     d="M 44 42 L 44 42.5 C 44 43.885 42.885 45 41.5 45 L 40.210938 45 L 40.210938 46.5 L 46 46.5 L 46 42 L 44 42 z "
+     style="fill:url(#radialGradient3013-3);fill-opacity:1;stroke:none;opacity:0.3" />
+  <path
+     id="rect3696-6"
+     d="M 2 42 L 2 46.5 L 7.7890625 46.5 L 7.7890625 45 L 6.5 45 C 5.115 45 4 43.885 4 42.5 L 4 42 L 2 42 z "
+     style="fill:url(#radialGradient3015-3);fill-opacity:1;stroke:none;opacity:0.3" />
+</svg>

=== added file 'data/mask.gresource.xml'
--- data/mask.gresource.xml	1970-01-01 00:00:00 +0000
+++ data/mask.gresource.xml	2016-12-21 23:45:45 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/io/elementary/wingpanel/sound">
+    <file compressed="true" preprocess="xml-stripblanks">image-mask.svg</file>
+  </gresource>
+</gresources>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-07 15:14:18 +0000
+++ src/CMakeLists.txt	2016-12-21 23:45:45 +0000
@@ -34,7 +34,10 @@
   --thread
 )
 
-add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C})
+include (GResource)
+glib_compile_resources (GLIB_RESOURCES_MASK ../data/mask.gresource.xml)
+
+add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C} ${GLIB_RESOURCES_MASK})
 target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES})
 
 # Installation

=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala	2016-11-07 15:14:18 +0000
+++ src/Widgets/MprisGui.vala	2016-12-21 23:45:45 +0000
@@ -27,6 +27,7 @@
 
     private Gtk.Revealer player_revealer;
     private Gtk.Image? background = null;
+    private Gtk.Image mask;
     private Gtk.Label title_label;
     private Gtk.Label artist_label;
     private Gtk.Button prev_btn;
@@ -146,15 +147,20 @@
         var player_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
 
         background = new Gtk.Image ();
-
-        background.margin_start = 4;
-        background.margin_end = 4;
-        background.margin_bottom = 2;
-        background.can_focus = true;
+        mask = new Gtk.Image.from_resource ("/io/elementary/wingpanel/sound/image-mask.svg");
+        mask.no_show_all = true;
+        mask.pixel_size = 48;
+        var overlay = new Gtk.Overlay ();
+        overlay.add (background);
+        overlay.add_overlay (mask);
+        overlay.margin_start = 4;
+        overlay.margin_end = 4;
+        overlay.margin_bottom = 2;
+        overlay.can_focus = true;
         var background_box = new Gtk.EventBox ();
         background_box.add_events (Gdk.EventMask.BUTTON_PRESS_MASK);
         background_box.button_press_event.connect (raise_player);
-        background_box.add (background);
+        background_box.add (overlay);
         player_box.pack_start (background_box, false, false, 0);
 
         var titles_events = new Gtk.EventBox ();
@@ -388,6 +394,8 @@
     private void update_art (string uri) {
         if  (!uri.has_prefix ("file://") && !uri.has_prefix  ("http")) {
             background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
+            mask.no_show_all = true;
+            mask.hide ();
             return;
         }
         if  (uri.has_prefix  ("file://")) {
@@ -395,6 +403,8 @@
             try {
                 var pbuf = new Gdk.Pixbuf.from_file_at_size (fname, ICON_SIZE, ICON_SIZE);
                 background.set_from_pixbuf (mask_pixbuf (pbuf));
+                mask.no_show_all = false;
+                mask.show ();
             } catch  (Error e) {
                 //background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
             }
@@ -409,11 +419,16 @@
       GLib.File file = GLib.File.new_for_uri (uri);
       try {
           GLib.InputStream stream = yield file.read_async (Priority.DEFAULT, load_remote_art_cancel);
-          Gdk.Pixbuf pixbuf = yield new Gdk.Pixbuf.from_stream_at_scale_async
-             (stream, ICON_SIZE, ICON_SIZE, true, load_remote_art_cancel);
-          background.set_from_pixbuf (mask_pixbuf (pixbuf));
+          Gdk.Pixbuf pixbuf = yield new Gdk.Pixbuf.from_stream_async (stream, load_remote_art_cancel);
+          if (pixbuf != null) {
+              background.set_from_pixbuf (mask_pixbuf (pixbuf));
+              mask.no_show_all = false;
+              mask.show ();
+          }
       } catch  (Error e) {
           background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
+          mask.no_show_all = true;
+          mask.hide ();
       }
     }
 
@@ -430,6 +445,8 @@
             last_artUrl = "";
             background.pixel_size = ICON_SIZE;
             background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
+            mask.no_show_all = true;
+            mask.hide ();
         }
         
         string title;
@@ -474,12 +491,6 @@
         Gdk.cairo_set_source_pixbuf (cr, input, offset_x, offset_y);
         cr.paint ();
 
-        cr.reset_clip ();
-
-        var mask = new Cairo.ImageSurface.from_png ("/usr/share/gala/image-mask.png");
-        cr.set_source_surface (mask, 0, 0);
-        cr.paint ();
-
         return Gdk.pixbuf_get_from_surface (surface, 0, 0, mask_size, mask_size);
     }
 }