Merge lp:~victored/pantheon-files/lp-1418653 into lp:~elementary-apps/pantheon-files/trunk

[Victor Martinez]

Use PoofWindow from LibPlank

Use PoofWindow from LibPlank

This implies adding libplank-dev as a build dependency and libplank0 as a runtime dependency

[Cody Garver (codygarver)]

review: Approve

=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2014-08-05 23:34:45 +0000
+++ libwidgets/CMakeLists.txt	2015-07-12 16:24:24 +0000
@@ -39,7 +39,6 @@
 vala_precompile(VALA_C ${PKGNAME}
     Animations.vala
     LocationBar.vala
-    PoofWindow.vala
     BreadcrumbsElements.vala
 PACKAGES
     gtk+-3.0

=== removed file 'libwidgets/PoofWindow.vala'
--- libwidgets/PoofWindow.vala	2015-05-03 06:44:42 +0000
+++ libwidgets/PoofWindow.vala	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-/***
-    Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-***/
-
-namespace Marlin.Animation
-{
-    /**
-     * An animated window that draws a 'poof' animation.
-     * Used when dragging items off the dock.
-     */
-    public class PoofWindow : Gtk.Window {
-        const int POOF_SIZE = 128;
-        const int POOF_FRAMES = 5;
-        const int MSEC_PER_FRAME = 60;
-        int frame_number = 0;
-
-        static PoofWindow? instance = null;
-
-        public static unowned PoofWindow get_default () {
-            if (instance == null)
-                instance = new PoofWindow ();
-
-            return instance;
-        }
-
-        Gdk.Pixbuf poof_image;
-
-        uint animation_timer = 0;
-
-        /**
-         * Creates a new poof window at the screen-relative coordinates specified.
-         */
-        public PoofWindow () {
-            GLib.Object (type: Gtk.WindowType.TOPLEVEL, type_hint: Gdk.WindowTypeHint.DOCK);
-        }
-
-        construct {
-            app_paintable = true;
-            decorated = false;
-            resizable = false;
-            double_buffered = false;
-
-            unowned Gdk.Screen screen = get_screen ();
-            set_visual (screen.get_rgba_visual () ?? screen.get_system_visual ());
-            accept_focus = false;
-            can_focus = false;
-            set_keep_above (true);
-
-            try {
-                poof_image = new Gdk.Pixbuf.from_file ("%s/poof.png".printf (Config.PIXMAP_DIR));
-            } catch {
-                poof_image = new Gdk.Pixbuf (Gdk.Colorspace.RGB, true, 8, 128, 640);
-                warning ("Unable to load poof animation image");
-            }
-
-            set_size_request (POOF_SIZE, POOF_SIZE);
-        }
-
-        ~PoofWindow () {
-            if (animation_timer > 0) {
-                GLib.Source.remove (animation_timer);
-                animation_timer = 0;
-            }
-        }
-
-        /**
-         * Show the animated poof-window at the given coordinates
-         *
-         * @param x the x position of the poof window
-         * @param y the y position of the poof window
-         */
-        public void show_at (int x, int y) {
-            if (animation_timer > 0)
-                GLib.Source.remove (animation_timer);
-
-            frame_number = 0;
-
-            show ();
-            move (x - (POOF_SIZE / 2), y - (POOF_SIZE / 2));
-
-            animation_timer = Gdk.threads_add_timeout (MSEC_PER_FRAME, () => {
-                if (frame_number++ < POOF_FRAMES) {
-                    queue_draw ();
-                    return true;
-                }
-
-                animation_timer = 0;
-                hide ();
-                return false;
-            });
-        }
-
-        public override bool draw (Cairo.Context cr) {
-            cr.set_operator (Cairo.Operator.SOURCE);
-            Gdk.cairo_set_source_pixbuf (cr,
-                                         poof_image,
-                                         0,
-                                         -POOF_SIZE * frame_number);
-            cr.paint ();
-
-            return true;
-        }
-    }
-}

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-01-18 20:46:03 +0000
+++ src/CMakeLists.txt	2015-07-12 16:24:24 +0000
@@ -26,6 +26,7 @@
     sqlite3
     dbus-glib-1
     libnotify>=0.7.2
+    plank
     zeitgeist-2.0)
 
 set (CFLAGS
@@ -98,6 +99,7 @@
         pantheon-files-widgets
         marlin
         zeitgeist-2.0
+        plank
     GENERATE_HEADER
         marlin-vala
     OPTIONS
@@ -163,6 +165,7 @@
         pantheon-files-widgets
         marlin
         zeitgeist-2.0
+        plank
     GENERATE_HEADER
         marlin-vala
     OPTIONS

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2015-06-24 07:49:31 +0000
+++ src/View/Sidebar.vala	2015-07-12 16:24:24 +0000
@@ -717,12 +717,12 @@
         private bool drag_failed_callback (Gdk.DragContext context, Gtk.DragResult result) {
             int x, y;
             Gdk.Device device;
-            Marlin.Animation.PoofWindow poof_window;
+            Plank.Widgets.PoofWindow poof_window;
 
             if (internal_drag_started && dragged_out_of_window) {
                 device = context.get_device ();
                 device.get_position (null, out x, out y);
-                poof_window = Marlin.Animation.PoofWindow.get_default ();
+                poof_window = Plank.Widgets.PoofWindow.get_default ();
                 poof_window.show_at (x, y);
                 remove_selected_bookmarks ();
                 return true;