Merge lp:~3v1n0/unity/dnd-launcher-icon-fixes into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: Focus and, in case, Spread the windows on DnD

After 1 second that an user is over an icon, that icon should focus the relative
application and Spread its windows if it has more than one opened.

Correctly handle the DnD scale in launcher, and apply glow to the icon under pointer.

To get all bugs properly fixed this needs lp:~3v1n0/compiz/scale-dndtarget-workarea-shape (not a strict dependency, though).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3794
http://jenkins.qa.ubuntu.com/job/unity-ci/876/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/410/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/876/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[Christopher Townsend (townsend)]

Cool, looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3794
http://jenkins.qa.ubuntu.com/job/unity-ci/901/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/435

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/901/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-03-21 05:23:42 +0000
+++ dash/DashController.cpp	2014-04-16 02:02:27 +0000
@@ -105,7 +105,9 @@
     }
   });
 
-  WindowManager::Default().initiate_spread.connect(sigc::mem_fun(this, &Controller::HideDash));
+  auto& wm = WindowManager::Default();
+  wm.initiate_spread.connect(sigc::mem_fun(this, &Controller::HideDash));
+  wm.screen_viewport_switch_started.connect(sigc::mem_fun(this, &Controller::HideDash));
 
   dbus_server_.AddObjects(dbus::INTROSPECTION, dbus::PATH);
   dbus_server_.GetObjects().front()->SetMethodsCallsHandler([this] (std::string const& method, GVariant*) {
 
=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2014-02-28 16:56:19 +0000
+++ hud/HudController.cpp	2014-04-16 02:02:27 +0000
@@ -102,6 +102,7 @@
   WindowManager& wm = WindowManager::Default();
   wm.screen_ungrabbed.connect(sigc::mem_fun(this, &Controller::OnScreenUngrabbed));
   wm.initiate_spread.connect(sigc::mem_fun(this, &Controller::HideHud));
+  wm.screen_viewport_switch_started.connect(sigc::mem_fun(this, &Controller::HideHud));
 
   hud_service_.queries_updated.connect(sigc::mem_fun(this, &Controller::OnQueriesFinished));
   timeline_animator_.updated.connect(sigc::mem_fun(this, &Controller::OnViewShowHideFrame));
 
=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2014-03-17 20:58:25 +0000
+++ launcher/AbstractLauncherIcon.h	2014-04-16 02:02:27 +0000
@@ -110,10 +110,11 @@
     UNFOLDED,
     STARTING,
     SHIMMER,
-    CENTER_SAVED,
+    DESAT,
+    GLOW,
     PROGRESS,
-    DESAT,
     PULSE_ONCE,
+    CENTER_SAVED,
 
     LAST
   };
 
=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2014-04-02 14:36:55 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2014-04-16 02:02:27 +0000
@@ -49,9 +49,10 @@
 // We use the "bamf-" prefix since the manager is protected, to avoid name clash
 const std::string WINDOW_MOVE_TIMEOUT = "bamf-window-move";
 const std::string ICON_REMOVE_TIMEOUT = "bamf-icon-remove";
-//const std::string ICON_DND_OVER_TIMEOUT = "bamf-icon-dnd-over";
+const std::string ICON_DND_OVER_TIMEOUT = "bamf-icon-dnd-over";
 const std::string DEFAULT_ICON = "application-default-icon";
 const int MAXIMUM_QUICKLIST_WIDTH = 300;
+const int COMPIZ_SCALE_DND_SPREAD = 1 << 7;
 
 enum MenuItemType
 {
@@ -1157,28 +1158,28 @@
   return _remote_uri;
 }
 
-void ApplicationLauncherIcon::OnDndHovered()
-{
-  // for now, let's not do this, it turns out to be quite buggy
-  //if (IsRunning())
-  //  Spread(CompAction::StateInitEdgeDnd, true);
-}
-
 void ApplicationLauncherIcon::OnDndEnter()
 {
-  /* Disabled, since the DND code is currently disabled as well.
-  _source_manager.AddTimeout(1000, [this] {
-    OnDndHovered();
+  auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+
+  _source_manager.AddTimeout(1000, [this, timestamp] {
+    WindowManager::Default().TerminateScale();
+
+    if (!IsRunning())
+      return false;
+
+    Focus(ActionArg(ActionArg::Source::LAUNCHER, 1, timestamp));
+
+    if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1)
+      Spread(true, COMPIZ_SCALE_DND_SPREAD, false);
+
     return false;
   }, ICON_DND_OVER_TIMEOUT);
-  */
 }
 
 void ApplicationLauncherIcon::OnDndLeave()
 {
-  /* Disabled, since the DND code is currently disabled as well.
   _source_manager.Remove(ICON_DND_OVER_TIMEOUT);
-  */
 }
 
 bool ApplicationLauncherIcon::IsFileManager()
 
=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2014-03-06 21:19:21 +0000
+++ launcher/ApplicationLauncherIcon.h	2014-04-16 02:02:27 +0000
@@ -83,7 +83,6 @@
   void AddProperties(debug::IntrospectionData&);
   void OnAcceptDrop(DndData const& dnd_data);
   void OnDndEnter();
-  void OnDndHovered();
   void OnDndLeave();
   void OpenInstanceLauncherIcon(Time timestamp) override;
   void ToggleSticky();
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-04-14 13:46:01 +0000
+++ launcher/Launcher.cpp	2014-04-16 02:02:27 +0000
@@ -157,6 +157,7 @@
   hide_machine_.should_hide_changed.connect(sigc::mem_fun(this, &Launcher::SetHidden));
   hide_machine_.reveal_progress.changed.connect(redraw_cb);
   hover_machine_.should_hover_changed.connect(sigc::mem_fun(this, &Launcher::SetHover));
+  bg_effect_helper_.enabled.changed.connect(redraw_cb);
 
   mouse_down.connect(sigc::mem_fun(this, &Launcher::RecvMouseDown));
   mouse_up.connect(sigc::mem_fun(this, &Launcher::RecvMouseUp));
@@ -599,7 +600,7 @@
   else
     urgent_progress = CLAMP(urgent_progress * 3.0f - 2.0f, 0.0f, 1.0f);  // we want to go 3x faster than the urgent normal cycle
 
-  arg.glow_intensity = urgent_progress;
+  arg.glow_intensity = icon->GetQuirkProgress(AbstractLauncherIcon::Quirk::GLOW, monitor()) + urgent_progress;
 
   if (options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
   {
@@ -1171,6 +1172,9 @@
   hide_machine_.SetQuirk(LauncherHideMachine::SCALE_ACTIVE, active);
   bg_effect_helper_.enabled = active;
 
+  if (hide_machine_.GetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE))
+    return;
+
   if (active && icon_under_mouse_)
     icon_under_mouse_->HideTooltip();
 
@@ -1592,6 +1596,7 @@
   icon->SetQuirkDuration(AbstractLauncherIcon::Quirk::CENTER_SAVED, ANIM_DURATION, monitor());
   icon->SetQuirkDuration(AbstractLauncherIcon::Quirk::PROGRESS, ANIM_DURATION, monitor());
   icon->SetQuirkDuration(AbstractLauncherIcon::Quirk::DESAT, ANIM_DURATION_SHORT_SHORT, monitor());
+  icon->SetQuirkDuration(AbstractLauncherIcon::Quirk::GLOW, ANIM_DURATION_SHORT, monitor());
 
   if (options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
     icon->SetQuirkDuration(AbstractLauncherIcon::Quirk::URGENT, (ANIM_DURATION_SHORT * WIGGLE_CYCLES), monitor());
@@ -2523,7 +2528,10 @@
   }
 
   if (!steal_drag_ && dnd_hovered_icon_)
+  {
     dnd_hovered_icon_->SendDndLeave();
+    dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+  }
 
   steal_drag_ = false;
   drag_edge_touching_ = false;
@@ -2581,7 +2589,10 @@
         mouse_position_.y <= (parent_->GetGeometry().height - icon_size_.CP(cv_) - 2 * SPACE_BETWEEN_ICONS.CP(cv_)))
     {
       if (dnd_hovered_icon_)
-          dnd_hovered_icon_->SendDndLeave();
+      {
+        dnd_hovered_icon_->SendDndLeave();
+        dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+      }
 
       animation::StartOrReverse(dnd_hide_animation_, animation::Direction::FORWARD);
       drag_edge_touching_ = true;
@@ -2640,6 +2651,9 @@
       {
         hovered_icon->SendDndEnter();
         drag_action_ = hovered_icon->QueryAcceptDrop(dnd_data_);
+
+        if (drag_action_ != nux::DNDACTION_NONE)
+          hovered_icon->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, true, monitor());
       }
       else
       {
@@ -2647,7 +2661,10 @@
       }
 
       if (dnd_hovered_icon_)
+      {
         dnd_hovered_icon_->SendDndLeave();
+        dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::GLOW, false, monitor());
+      }
 
       dnd_hovered_icon_ = hovered_icon;
     }
 
=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2014-01-15 14:51:10 +0000
+++ launcher/TrashLauncherIcon.cpp	2014-04-16 02:02:27 +0000
@@ -173,6 +173,7 @@
   }
 
   SetQuirk(LauncherIcon::Quirk::PULSE_ONCE, true);
+  FullyAnimateQuirkDelayed(100, LauncherIcon::Quirk::SHIMMER);
 }
 
 std::string TrashLauncherIcon::GetName() const
 
=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2014-02-13 10:14:20 +0000
+++ launcher/VolumeLauncherIcon.cpp	2014-04-16 02:02:27 +0000
@@ -410,6 +410,7 @@
   auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
   pimpl_->CopyFilesToVolume(dnd_data.Uris(), timestamp);
   SetQuirk(Quirk::PULSE_ONCE, true);
+  FullyAnimateQuirkDelayed(100, LauncherIcon::Quirk::SHIMMER);
 }
 
 //
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-14 14:21:46 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-16 02:02:27 +0000
@@ -517,6 +517,7 @@
 
 void UnityScreen::OnInitiateSpread()
 {
+  scale_just_activated_ = super_keypressed_;
   spread_filter_ = std::make_shared<spread::Filter>();
   spread_filter_->text.changed.connect([this] (std::string const& filter) {
     if (filter.empty())
@@ -1977,19 +1978,7 @@
 {
   PluginAdapter& adapter = PluginAdapter::Default();
   adapter.NotifyCompizEvent(plugin, event, option);
-  compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::handleCompizEvent (plugin, event, option);
-
-  if (launcher_controller_->IsOverlayOpen() && g_strcmp0(event, "start_viewport_switch") == 0)
-  {
-    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
-  }
-
-  if (super_keypressed_ && g_strcmp0(plugin, "scale") == 0 &&
-      g_strcmp0(event, "activate") == 0)
-  {
-    scale_just_activated_ = CompOption::getBoolOptionNamed(option, "active");
-  }
-
+  compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::handleCompizEvent(plugin, event, option);
   screen->handleCompizEvent(plugin, event, option);
 }
 
@@ -3836,8 +3825,10 @@
     CompOption::Value v(launcher_width);
     screen->setOptionForPlugin("expo", "x_offset", v);
 
-    if (launcher_controller_->options()->hide_mode != LAUNCHER_HIDE_NEVER)
-      screen->setOptionForPlugin("scale", "x_offset", v);
+    if (launcher_controller_->options()->hide_mode == LAUNCHER_HIDE_NEVER)
+      v.set(0);
+
+    screen->setOptionForPlugin("scale", "x_offset", v);
   };
 
   for (auto const& launcher : launcher_controller_->launchers())
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-04-02 21:42:12 +0000
+++ unity-shared/PluginAdapter.cpp	2014-04-16 02:02:27 +0000
@@ -190,15 +190,34 @@
     _vp_switch_started = false;
     screen_viewport_switch_ended.emit();
   }
-  else if (IsScaleActive() && g_strcmp0(plugin, "scale") == 0 &&
-           g_strcmp0(event, "activate") == 0)
+  else if (g_strcmp0(plugin, "scale") == 0 && g_strcmp0(event, "activate") == 0)
   {
-    // If the scale plugin is activated again while is already grabbing the screen
-    // it means that is switching the view (i.e. switching from a spread application
-    // to another), so we need to notify our clients that it has really terminated
-    // and initiated again.
-    terminate_spread.emit();
-    initiate_spread.emit();
+    bool new_state = CompOption::getBoolOptionNamed(option, "active");
+
+    if (_spread_state != new_state)
+    {
+      _spread_state = new_state;
+      _spread_state ? initiate_spread.emit() : terminate_spread.emit();
+
+      if (!_spread_state)
+        _spread_windows_state = false;
+    }
+    else if (_spread_state && new_state)
+    {
+      // If the scale plugin is activated again while is already grabbing the screen
+      // it means that is switching the view (i.e. switching from a spread application
+      // to another), so we need to notify our clients that it has really terminated
+      // and initiated again.
+
+      bool old_windows_state = _spread_windows_state;
+      _spread_state = false;
+      _spread_windows_state = false;
+      terminate_spread.emit();
+
+      _spread_state = true;
+      _spread_windows_state = old_windows_state;
+      initiate_spread.emit();
+    }
   }
 }