Merge lp:~jeremywootten/pantheon-files/bookmark-delete-by-dragging into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Dragging a bookmark completely out of the sidebar window now triggers its removal.
The "PoofWindow" animation code and graphic from Plank has been copied into the Files code. This fixes bug #691696.

Dragging a bookmark completely out of the sidebar window now triggers its removal.
The "PoofWindow" animation code and graphic from Plank has been copied into the Files code.
In the longer term, it would be desirable to have this animation, or a similar one, provided by Granite to both Files and Plank (and potentially other Elementary apps) for consistency and to avoid duplication of code. See https://blueprints.launchpad.net/granite/+spec/granite-animations.

At the moment, the animation is only triggered by dragging out of window. Other means of deleting a bookmark (context menu or keyboard shortcut) are not animated. This could be added if thought desirable.

Re-submitted after replacing tabs by spaces in Plank derived files and removing unused Plank derived file.

[Rico Tzschichholz (ricotz)]

There is no need for the AnimatedRenderer.

Drop CompositedWindows as well and add the needed calls of construct {...} to PoofWindow

[lp:~jeremywootten/pantheon-files/bookmark-delete-by-dragging]

1434. By Jeremy Wootten on 2014-02-17

Merge CompositedWindow construction into PoofWindow

1435. By Jeremy Wootten on 2014-02-17

Reformat and refactor PoofWindow code - animation speed controlled by MSEC_PER_FRAME

[Jeremy Wootten (jeremywootten)]

Thanks for the suggestions Rico - I have done as you have suggested. While
refactoring PoofWindow I have added a separate revision that reformats it
according to the coding guidelines and also made it a little clearer (I
think). The animation speed is more easily controlled by setting the
MSEC_PER_FRAME value. I have slowed it down a little but that is a matter
of taste. Bookmarks are less explosive than launchers!?

On Mon, Feb 17, 2014 at 7:55 PM, Rico Tzschichholz <email address hidden>wrote:

> There is no need for the AnimatedRenderer.
>
> Drop CompositedWindows as well and add the needed calls of construct {...}
> to PoofWindow
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/bookmark-delete-by-dragging/+merge/206615
> You are the owner of
> lp:~jeremywootten/pantheon-files/bookmark-delete-by-dragging.
>

[Cody Garver (codygarver)]

Needs trunk merged in then I will request an animation speed review from Dan

[lp:~jeremywootten/pantheon-files/bookmark-delete-by-dragging]

1436. By Jeremy Wootten on 2014-03-23

Merge changes from trunk and reimplement in sidebar.vala

[Jeremy Wootten (jeremywootten)]

> Needs trunk merged in then I will request an animation speed review from Dan

Trunk now merged and C code reimplemented in Sidebar.vala

[Danielle Foré (danrabbit)]

Hmm, how do we feel about something like 60ms per frame? should be a 300ms animation.

[lp:~jeremywootten/pantheon-files/bookmark-delete-by-dragging]

1437. By Jeremy Wootten on 2014-03-24

Set frame rate to 60 msec per frame

[Jeremy Wootten (jeremywootten)]

OK, done.

On 23 March 2014 19:36, Daniel Fore <email address hidden> wrote:

> Hmm, how do we feel about something like 60ms per frame? should be a 300ms
> animation.
>
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/bookmark-delete-by-dragging/+merge/206615
> You are the owner of
> lp:~jeremywootten/pantheon-files/bookmark-delete-by-dragging.
>

[Rico Tzschichholz (ricotz)]

@cody: Did you test-built this?

[Rico Tzschichholz (ricotz)]

@cody: Pushed a fix to trunk

[Cody Garver (codygarver)]

Thanks a lot Rico

=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2013-05-19 10:30:14 +0000
+++ icons/CMakeLists.txt	2014-03-24 19:47:08 +0000
@@ -1,1 +1,1 @@
-install(FILES thumbnail_frame.png DESTINATION ${PIXMAP_DIR})
\ No newline at end of file
+install(FILES thumbnail_frame.png poof.png DESTINATION ${PIXMAP_DIR})

=== added file 'icons/poof.png'
Binary files icons/poof.png	1970-01-01 00:00:00 +0000 and icons/poof.png	2014-03-24 19:47:08 +0000 differ
=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2014-01-24 18:36:41 +0000
+++ libwidgets/CMakeLists.txt	2014-03-24 19:47:08 +0000
@@ -23,19 +23,23 @@
 
 set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
 set(LIBS
-	${DEP_LIBRARIES}
+    ${DEP_LIBRARIES}
 )
 add_definitions(${CFLAGS})
 
 link_libraries(${LIBS})
 set(LIB_PATHS
-	${DEPS_LIBRARY_DIRS}
+    ${DEPS_LIBRARY_DIRS}
 )
 link_directories(${LIB_PATHS})
 
+include_directories (${CMAKE_CURRENT_BINARY_DIR})
+include_directories (${CMAKE_BINARY_DIR})
+
 vala_precompile(VALA_C ${PKGNAME}
     Animations.vala
     LocationBar.vala
+    PoofWindow.vala
     BreadcrumbsElements.vala
     BreadcrumbsEntry.vala
 PACKAGES
@@ -43,6 +47,8 @@
     granite
     gee-0.8
     posix
+    marlincore
+    marlincore-C
 OPTIONS
     --thread
 GENERATE_VAPI

=== added file 'libwidgets/PoofWindow.vala'
--- libwidgets/PoofWindow.vala	1970-01-01 00:00:00 +0000
+++ libwidgets/PoofWindow.vala	2014-03-24 19:47:08 +0000
@@ -0,0 +1,117 @@
+//
+//  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/View/Sidebar.vala'
--- src/View/Sidebar.vala	2014-03-16 18:08:56 +0000
+++ src/View/Sidebar.vala	2014-03-24 19:47:08 +0000
@@ -70,6 +70,8 @@
         Gdk.DragContext drag_context;
         bool received_drag_data;
         bool drop_occurred;
+        bool internal_drag_started;
+        bool dragged_out_of_window;
 
         /* Identifiers for target types */
         public enum TargetType {
@@ -260,6 +262,8 @@
             tree_view.drag_leave.connect (drag_leave_callback);
             tree_view.drag_data_received.connect (drag_data_received_callback);
             tree_view.drag_drop.connect (drag_drop_callback);
+            tree_view.drag_failed.connect (drag_failed_callback);
+            tree_view.drag_end.connect (drag_end_callback);
 
             (tree_view.get_selection ()).changed.connect (selection_changed_cb);
             tree_view.popup_menu.connect (popup_menu_cb);
@@ -692,6 +696,27 @@
 
 /* DRAG N DROP FUNCTIONS START */
 
+        private bool drag_failed_callback (Gdk.DragContext context, Gtk.DragResult result) {
+            int x, y;
+            Gdk.Device device;
+            Marlin.Animation.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.show_at (x, y);
+                remove_selected_bookmarks ();
+                return true;
+            } else
+                return false;
+        }
+
+        private void drag_end_callback (Gdk.DragContext context) {
+            internal_drag_started = false;
+            dragged_out_of_window = false;
+        }
+
         private bool drag_motion_callback (Gdk.DragContext context,
                                            int x,
                                            int y,
@@ -709,8 +734,10 @@
             if (pos == Gtk.TreeViewDropPosition.BEFORE
              || pos == Gtk.TreeViewDropPosition.AFTER) {
                 if (received_drag_data
-                 && drag_data_info == TargetType.GTK_TREE_MODEL_ROW)
+                 && drag_data_info == TargetType.GTK_TREE_MODEL_ROW) {
                     action = Gdk.DragAction.MOVE;
+                    internal_drag_started = true;
+                }
                 else if (drag_list != null
                       && can_accept_files_as_bookmarks (drag_list))
                     action = Gdk.DragAction.COPY;
@@ -877,6 +904,7 @@
         }
 
         private void drag_leave_callback (Gdk.DragContext context, uint time) {
+            dragged_out_of_window = true;
             free_drag_data ();
             tree_view.set_drag_dest_row (null, Gtk.TreeViewDropPosition.BEFORE);
             GLib.Signal.stop_emission_by_name (tree_view, "drag-leave");