diff -Nru plank-0.8.1+bzr1203/ChangeLog plank-0.8.1+bzr1206/ChangeLog --- plank-0.8.1+bzr1203/ChangeLog 2015-03-24 18:20:04.000000000 +0000 +++ plank-0.8.1+bzr1206/ChangeLog 2015-03-27 07:23:15.000000000 +0000 @@ -1,3 +1,17 @@ +2015-03-25 Rico Tzschichholz + + renderer: Do not animate item if it got removed with drag'n'drop + +2015-03-25 Rico Tzschichholz + + element: Add "IsVisible" which *only* controls whether to draw the item + +2015-03-25 Rico Tzschichholz + + element: Rename IsVisible to IsAttached + + This matches its function better. + 2015-03-24 Rico Tzschichholz dockwindow: Do not stop motion-events by default diff -Nru plank-0.8.1+bzr1203/configure plank-0.8.1+bzr1206/configure --- plank-0.8.1+bzr1203/configure 2015-03-24 18:19:26.000000000 +0000 +++ plank-0.8.1+bzr1206/configure 2015-03-27 07:22:39.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for plank 0.8.1.1203. +# Generated by GNU Autoconf 2.69 for plank 0.8.1.1206. # # Report bugs to . # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='plank' PACKAGE_TARNAME='plank' -PACKAGE_VERSION='0.8.1.1203' -PACKAGE_STRING='plank 0.8.1.1203' +PACKAGE_VERSION='0.8.1.1206' +PACKAGE_STRING='plank 0.8.1.1206' PACKAGE_BUGREPORT='https://bugs.launchpad.net/plank' PACKAGE_URL='https://launchpad.net/plank' @@ -1497,7 +1497,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures plank 0.8.1.1203 to adapt to many kinds of systems. +\`configure' configures plank 0.8.1.1206 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1567,7 +1567,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of plank 0.8.1.1203:";; + short | recursive ) echo "Configuration of plank 0.8.1.1206:";; esac cat <<\_ACEOF @@ -1717,7 +1717,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -plank configure 0.8.1.1203 +plank configure 0.8.1.1206 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2086,7 +2086,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by plank $as_me 0.8.1.1203, which was +It was created by plank $as_me 0.8.1.1206, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2976,7 +2976,7 @@ # Define the identity of the package. PACKAGE='plank' - VERSION='0.8.1.1203' + VERSION='0.8.1.1206' cat >>confdefs.h <<_ACEOF @@ -14550,7 +14550,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by plank $as_me 0.8.1.1203, which was +This file was extended by plank $as_me 0.8.1.1206, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14617,7 +14617,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -plank config.status 0.8.1.1203 +plank config.status 0.8.1.1206 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru plank-0.8.1+bzr1203/debian/changelog plank-0.8.1+bzr1206/debian/changelog --- plank-0.8.1+bzr1203/debian/changelog 2015-03-24 18:20:39.000000000 +0000 +++ plank-0.8.1+bzr1206/debian/changelog 2015-03-27 07:23:56.000000000 +0000 @@ -1,8 +1,8 @@ -plank (0.8.1+bzr1203-0ubuntu1~14.10~ricotz1) utopic; urgency=high +plank (0.8.1+bzr1206-0ubuntu1~14.10~ricotz1) utopic; urgency=high - * New development release of lp:plank bzr1203 + * New development release of lp:plank bzr1206 - -- Rico Tzschichholz Tue, 24 Mar 2015 19:20:39 +0100 + -- Rico Tzschichholz Fri, 27 Mar 2015 08:23:56 +0100 plank (0.6.1-1) unstable; urgency=low diff -Nru plank-0.8.1+bzr1203/docs/vala-doc/plank/plank.devhelp2 plank-0.8.1+bzr1206/docs/vala-doc/plank/plank.devhelp2 --- plank-0.8.1+bzr1203/docs/vala-doc/plank/plank.devhelp2 2015-03-24 18:20:03.000000000 +0000 +++ plank-0.8.1+bzr1206/docs/vala-doc/plank/plank.devhelp2 2015-03-27 07:23:15.000000000 +0000 @@ -503,6 +503,7 @@ + diff -Nru plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.DockController.html plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.DockController.html --- plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.DockController.html 2015-03-24 18:20:03.000000000 +0000 +++ plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.DockController.html 2015-03-27 07:23:14.000000000 +0000 @@ -168,6 +168,7 @@
    +
  • scrolled
  • on_scrolled
  • get_dock
  • get_menu_items
    • diff -Nru plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockElement.html plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockElement.html --- plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockElement.html 2015-03-24 18:20:03.000000000 +0000 +++ plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockElement.html 2015-03-27 07:23:14.000000000 +0000 @@ -72,9 +72,15 @@
    The dock item's text.
    +
  • public bool IsAttached { set; get; } + +
    Whether the item is currently hidden on the dock. If TRUE it will be + drawn and does consume space. If FALSE it will not be drawn and does not consume space. +
  • public bool IsVisible { set; get; } -
    Whether the item is currently visible on the dock. +
    Whether the item is currently visible on the dock. If TRUE it will + be drawn and does consume space. If FALSE it will not be drawn and does consume space.
  • public PopupButton Button { protected set; get; } diff -Nru plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockElement.IsAttached.html plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockElement.IsAttached.html --- plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockElement.IsAttached.html 1970-01-01 00:00:00.000000000 +0000 +++ plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockElement.IsAttached.html 2015-03-27 07:23:14.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + Plank.Items.DockElement.IsAttached – plank – Vala Binding Reference + + + +
    Plank.Items.DockElement.IsAttached – plank Reference Manual
    +
    +
    +

    IsAttached

    +
    +

    Description:

    +
    public bool IsAttached { set; get; } +
    +
    +

    Whether the item is currently hidden on the dock. If TRUE it will be drawn and does consume space. If FALSE it will not be drawn and does + not consume space.

    +
    +
    +

    +
    Generated by Valadoc +
    + + \ No newline at end of file diff -Nru plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockElement.IsVisible.html plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockElement.IsVisible.html --- plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockElement.IsVisible.html 2015-03-24 18:20:03.000000000 +0000 +++ plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockElement.IsVisible.html 2015-03-27 07:23:14.000000000 +0000 @@ -16,7 +16,8 @@
    public bool IsVisible { set; get; }
    -

    Whether the item is currently visible on the dock.

    +

    Whether the item is currently visible on the dock. If TRUE it will be drawn and does consume space. If FALSE it will not be drawn and + does consume space.


diff -Nru plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockItem.html plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockItem.html --- plank-0.8.1+bzr1203/docs/vala-doc/plank/Plank.Items.DockItem.html 2015-03-24 18:20:03.000000000 +0000 +++ plank-0.8.1+bzr1206/docs/vala-doc/plank/Plank.Items.DockItem.html 2015-03-27 07:23:14.000000000 +0000 @@ -196,6 +196,7 @@
    +
  • scrolled
  • on_scrolled
  • get_dock
  • get_menu_items
    • diff -Nru plank-0.8.1+bzr1203/lib/DockRenderer.vala plank-0.8.1+bzr1206/lib/DockRenderer.vala --- plank-0.8.1+bzr1203/lib/DockRenderer.vala 2015-03-24 18:19:04.000000000 +0000 +++ plank-0.8.1+bzr1206/lib/DockRenderer.vala 2015-03-27 07:22:20.000000000 +0000 @@ -356,7 +356,7 @@ start2 = new DateTime.now_local (); #endif // Do not draw the currently dragged item or items which are suppose to be drawn later - if (move_time < move_duration && dragged_item != item && !items.contains (item)) { + if (move_time < move_duration && item.IsVisible && dragged_item != item && !items.contains (item)) { var draw_value = get_animated_draw_value_for_item (item); draw_item (item_cr, item, ref draw_value); draw_item_shadow (shadow_cr, item, ref draw_value); @@ -452,7 +452,7 @@ start2 = new DateTime.now_local (); #endif // Do not draw the currently dragged item - if (dragged_item != item) { + if (item.IsVisible && dragged_item != item) { var draw_value = get_animated_draw_value_for_item (item); draw_item (item_cr, item, ref draw_value); draw_item_shadow (shadow_cr, item, ref draw_value); diff -Nru plank-0.8.1+bzr1203/lib/DragManager.vala plank-0.8.1+bzr1206/lib/DragManager.vala --- plank-0.8.1+bzr1203/lib/DragManager.vala 2015-03-24 18:19:04.000000000 +0000 +++ plank-0.8.1+bzr1206/lib/DragManager.vala 2015-03-27 07:22:20.000000000 +0000 @@ -291,8 +291,10 @@ if (DragItem.can_be_removed ()) { // Remove from dock unowned ApplicationDockItem? app_item = (DragItem as ApplicationDockItem); - if (app_item == null || !(app_item.is_running () || app_item.has_unity_info ())) + if (app_item == null || !(app_item.is_running () || app_item.has_unity_info ())) { + DragItem.IsVisible = false; DragItem.Container.remove_item (DragItem); + } DragItem.delete (); int x, y; diff -Nru plank-0.8.1+bzr1203/lib/Items/DefaultApplicationDockItemProvider.vala plank-0.8.1+bzr1206/lib/Items/DefaultApplicationDockItemProvider.vala --- plank-0.8.1+bzr1203/lib/Items/DefaultApplicationDockItemProvider.vala 2015-03-24 18:19:04.000000000 +0000 +++ plank-0.8.1+bzr1206/lib/Items/DefaultApplicationDockItemProvider.vala 2015-03-27 07:22:20.000000000 +0000 @@ -67,12 +67,12 @@ unowned Wnck.Workspace? active_workspace = Wnck.Screen.get_default ().get_active_workspace (); foreach (var item in internal_elements) { unowned TransientDockItem? transient = (item as TransientDockItem); - item.IsVisible = (transient == null || transient.App == null || active_workspace == null + item.IsAttached = (transient == null || transient.App == null || active_workspace == null || WindowControl.has_window_on_workspace (transient.App, active_workspace)); } } else { foreach (var item in internal_elements) - item.IsVisible = true; + item.IsAttached = true; } base.update_visible_items (); diff -Nru plank-0.8.1+bzr1203/lib/Items/DockContainer.vala plank-0.8.1+bzr1206/lib/Items/DockContainer.vala --- plank-0.8.1+bzr1203/lib/Items/DockContainer.vala 2015-03-24 18:19:04.000000000 +0000 +++ plank-0.8.1+bzr1206/lib/Items/DockContainer.vala 2015-03-27 07:22:20.000000000 +0000 @@ -208,7 +208,7 @@ visible_elements.clear (); foreach (var item in internal_elements) - if (item.IsVisible) + if (item.IsAttached) visible_elements.add (item); var added_items = new Gee.ArrayList (); diff -Nru plank-0.8.1+bzr1203/lib/Items/DockElement.vala plank-0.8.1+bzr1206/lib/Items/DockElement.vala --- plank-0.8.1+bzr1203/lib/Items/DockElement.vala 2015-03-24 18:19:04.000000000 +0000 +++ plank-0.8.1+bzr1206/lib/Items/DockElement.vala 2015-03-27 07:22:20.000000000 +0000 @@ -109,7 +109,16 @@ public string Text { get; set; default = ""; } /** + * Whether the item is currently hidden on the dock. + * If TRUE it will be drawn and does consume space. + * If FALSE it will not be drawn and does not consume space. + */ + public bool IsAttached { get; set; default = true; } + + /** * Whether the item is currently visible on the dock. + * If TRUE it will be drawn and does consume space. + * If FALSE it will not be drawn and does consume space. */ public bool IsVisible { get; set; default = true; } diff -Nru plank-0.8.1+bzr1203/.tarball-version plank-0.8.1+bzr1206/.tarball-version --- plank-0.8.1+bzr1203/.tarball-version 2015-03-24 18:20:05.000000000 +0000 +++ plank-0.8.1+bzr1206/.tarball-version 2015-03-27 07:23:16.000000000 +0000 @@ -1 +1 @@ -0.8.1.1203 +0.8.1.1206 diff -Nru plank-0.8.1+bzr1203/.version plank-0.8.1+bzr1206/.version --- plank-0.8.1+bzr1203/.version 2015-03-24 18:19:35.000000000 +0000 +++ plank-0.8.1+bzr1206/.version 2015-03-27 07:22:48.000000000 +0000 @@ -1 +1 @@ -0.8.1.1203 +0.8.1.1206