Merge lp:~ianchou821/ubuntu/utopic/unity/fix-lp1372130 into lp:unity

[Yu-Cheng Chou]

[Stephen M. Webb (bregma)]

I'm sorry, this merge proposal does not appear on the usual bug-fix radar so got missed. I'm assuming it's because of the unusual path of the proposed branch in Launchpad (it's a diff against the Ubuntu package rather than the upstream project).

Please remove the debian/changelog changes and set the change message as a commit message to this merge proposal instead so that the Ubuntu autolander will handle it correctly.

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

hey, any news in this merge proposal? Can you fix it?

[Yu-Cheng Chou (ianchou821)]

it has been a long time, I'll check it out this weekend. If you could
provide me some tutorial or document on how to create a pr for ubuntu, that
will be great.

Thanks

On Tue, Oct 27, 2015 at 12:13 AM, Marco Trevisan (Treviño) <[e-mail]>
wrote:

> hey, any news in this merge proposal? Can you fix it?
> --
>
> https://code.launchpad.net/~ianchou821/ubuntu/utopic/unity/fix-lp1372130/+merge/235419
> You are the owner of lp:~ianchou821/ubuntu/utopic/unity/fix-lp1372130.
>

Unmerged revisions

3877. By Yu-Cheng Chou on 2014-09-25

Launcher: handle Trash icon under "steal drag" mode. (LP: #1372130)

3876. By Yu-Cheng Chou on 2014-09-25

Launcher: handle the switch between steal_drag and enter Trash.
(LP: #1372130)

3875. By Yu-Cheng Chou on 2014-09-21

Launcher.cpp: just ignore Trash in "steal drag" mode. (LP: #1372130)

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-15 12:35:46 +0000
+++ debian/changelog	2014-09-25 16:10:37 +0000
@@ -1,3 +1,9 @@
+unity (7.3.1+14.10.20140915-0ubuntu4) UNRELEASED; urgency=medium
+
+  * Launcher: handle Trash icon under "steal drag" mode. (LP: #1372130)
+
+ -- Yu-Cheng Chou <[e-mail]>  Fri, 26 Sep 2014 00:07:05 +0800
+
 unity (7.3.1+14.10.20140915-0ubuntu1) utopic; urgency=low
 
   [ Michael Zanetti ]

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-09-04 22:11:33 +0000
+++ launcher/Launcher.cpp	2014-09-25 16:10:37 +0000
@@ -2517,16 +2517,18 @@
 #ifdef USE_X11
   SetActionState(ACTION_NONE);
 
-  if (steal_drag_ && dnd_hovered_icon_)
-  {
-    dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false, monitor());
-    dnd_hovered_icon_->remove.emit(dnd_hovered_icon_);
-  }
-
-  if (!steal_drag_ && dnd_hovered_icon_)
-  {
-    dnd_hovered_icon_->SendDndLeave();
-    dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+  if (dnd_hovered_icon_)
+  {
+    if (dnd_hovered_icon_->GetIconType() == AbstractLauncherIcon::IconType::SPACER)
+    {
+      dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false, monitor());
+      dnd_hovered_icon_->remove.emit(dnd_hovered_icon_);
+    }
+    else
+    {
+      dnd_hovered_icon_->SendDndLeave();
+      dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+    }
   }
 
   steal_drag_ = false;
@@ -2602,19 +2604,20 @@
   EventLogic();
   auto const& hovered_icon = MouseIconIntersection(mouse_position_.x, mouse_position_.y);
 
-  bool hovered_icon_is_appropriate = false;
-  if (hovered_icon)
-  {
-    if (hovered_icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH)
-      steal_drag_ = false;
-
-    if (hovered_icon->position() == AbstractLauncherIcon::Position::FLOATING)
-      hovered_icon_is_appropriate = true;
-  }
-
-  if (steal_drag_)
+  bool hovered_icon_is_appropriate = hovered_icon && hovered_icon->position() == AbstractLauncherIcon::Position::FLOATING;
+  bool hovered_icon_is_trash = hovered_icon && hovered_icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+  bool dnd_hovered_icon_is_trash = dnd_hovered_icon_ && dnd_hovered_icon_->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+
+  if (steal_drag_ && !hovered_icon_is_trash)
   {
     drag_action_ = nux::DNDACTION_COPY;
+    if (dnd_hovered_icon_is_trash)
+    {
+      dnd_hovered_icon_->SendDndLeave();
+      dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+      dnd_hovered_icon_ = nullptr;
+    }
+
     if (!dnd_hovered_icon_ && hovered_icon_is_appropriate)
     {
       dnd_hovered_icon_ = new SpacerLauncherIcon(monitor());
@@ -2657,8 +2660,16 @@
 
       if (dnd_hovered_icon_)
       {
-        dnd_hovered_icon_->SendDndLeave();
-        dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+        if (dnd_hovered_icon_->GetIconType() == AbstractLauncherIcon::IconType::SPACER)
+        {
+          dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false, monitor());
+          dnd_hovered_icon_->remove.emit(dnd_hovered_icon_);
+        }
+        else
+        {
+          dnd_hovered_icon_->SendDndLeave();
+          dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+        }
       }
 
       dnd_hovered_icon_ = hovered_icon;
@@ -2678,7 +2689,9 @@
 void Launcher::ProcessDndDrop(int x, int y)
 {
 #ifdef USE_X11
-  if (steal_drag_)
+  bool dnd_hovered_icon_is_trash = dnd_hovered_icon_ && dnd_hovered_icon_->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+
+  if (steal_drag_ && !dnd_hovered_icon_is_trash)
   {
     for (auto const& uri : dnd_data_.Uris())
     {