Merge lp:~3v1n0/unity/menu-manager-multimonitor-scrubbing-fix into lp:unity

[Marco Trevisan (Treviño)]

Panel: ensure the menu-manager tracker is updated to match monitor

Also always use an unique name for panel depending on monitor

[Andrea Azzarone (azzar1)]

LGTM,

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2017-04-07 18:28:56 +0000
+++ dash/DashView.cpp	2017-04-18 10:51:13 +0000
@@ -1447,6 +1447,7 @@
         for (auto const& view : scope_views_)
           view.second->neko_mode = (i != 0);
 
+        search_bar_->search_string = "";
         return;
       }
     }

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2017-04-07 18:28:56 +0000
+++ dash/ResultRendererTile.cpp	2017-04-18 10:51:13 +0000
@@ -282,8 +282,9 @@
     };
     gsize tmp0;
     int tmp1 = tile_size - (rand() % RawPixel(16).CP(scale));
-    glib::String tmp2((gchar*)g_base64_decode(pool[rand() % pool.size()], &tmp0));
-    icon_name = glib::String(g_strdup_printf(tmp2, tmp1, tmp1)).Str();
+    int tmp2 = tile_size - (rand() % RawPixel(16).CP(scale));
+    glib::String tmp3((gchar*)g_base64_decode(pool[rand() % pool.size()], &tmp0));
+    icon_name = glib::String(g_strdup_printf(tmp3, tmp1, tmp2)).Str();
   }
 
   glib::Object<GIcon> icon(g_icon_new_for_string(icon_name.c_str(), nullptr));

=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2016-08-29 18:09:02 +0000
+++ lockscreen/LockScreenPanel.cpp	2017-04-18 10:51:13 +0000
@@ -149,7 +149,7 @@
 
 std::string Panel::GetPanelName() const
 {
-  return "LockScreenPanel";
+  return "LockScreenPanel" + std::to_string(reinterpret_cast<uintptr_t>(this));
 }
 
 void Panel::OnIndicatorViewUpdated()

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2016-09-01 23:57:23 +0000
+++ panel/PanelView.cpp	2017-04-18 10:51:13 +0000
@@ -52,7 +52,8 @@
 PanelView::PanelView(MockableBaseWindow* parent, menu::Manager::Ptr const& menus, NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
   , parent_(parent)
-  , remote_(menus->Indicators())
+  , menus_(menus)
+  , remote_(menus_->Indicators())
   , is_dirty_(true)
   , opacity_maximized_toggle_(false)
   , needs_geo_sync_(false)
@@ -134,7 +135,7 @@
 PanelView::~PanelView()
 {
   indicator::EntryLocationMap locations;
-  remote_->SyncGeometries(GetName() + std::to_string(monitor_), locations);
+  remote_->SyncGeometries(GetPanelName(), locations);
 }
 
 void PanelView::LoadTextures()
@@ -735,7 +736,7 @@
 
 std::string PanelView::GetPanelName() const
 {
-  return GetName() + std::to_string(monitor_);
+  return GetName() + std::to_string(reinterpret_cast<uintptr_t>(this)) + '_' + std::to_string(monitor_);
 }
 
 void PanelView::SyncGeometries()
@@ -751,9 +752,13 @@
 
 void PanelView::SetMonitor(int monitor)
 {
+  auto mouse_tracker_cb = sigc::mem_fun(this, &PanelView::OnMenuPointerMoved);
+  menus_->UnregisterTracker(GetPanelName(), mouse_tracker_cb);
+
   monitor_ = monitor;
   menu_view_->SetMonitor(monitor);
   indicators_->SetMonitor(monitor);
+  menus_->RegisterTracker(GetPanelName(), mouse_tracker_cb);
   Resize();
 
   if (WindowManager::Default().IsScaleActive())

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2016-08-29 17:42:24 +0000
+++ panel/PanelView.h	2017-04-18 10:51:13 +0000
@@ -111,6 +111,7 @@
   void AddPanelView(PanelIndicatorsView* child, unsigned int stretchFactor);
 
   MockableBaseWindow* parent_;
+  menu::Manager::Ptr menus_;
   indicator::Indicators::Ptr remote_;
 
   // No ownership is taken for these views, that is done by the AddChild method.

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2015-10-01 17:17:15 +0000
+++ services/panel-main.c	2017-04-18 10:51:13 +0000
@@ -343,6 +343,31 @@
     }
 }
 
+void
+on_unity_dbus_name_owner_changed_cb (GDBusConnection *connection,
+                                     const gchar *sender_name,
+                                     const gchar *object_path,
+                                     const gchar *interface_name,
+                                     const gchar *signal_name,
+                                     GVariant *parameters,
+                                     gpointer user_data)
+{
+  PanelService *service;
+  const gchar *owner_name;
+  const gchar *old_address;
+  const gchar *new_address;
+
+  g_variant_get (parameters, "(&s&s&s)", &owner_name, &old_address, &new_address);
+  g_debug ("%s: %s, %s -> %s", G_STRFUNC, owner_name, old_address, new_address);
+
+  service = user_data;
+
+  if (!new_address || *new_address == '\0')
+    {
+      panel_service_clear_remote_data (service);
+    }
+}
+
 static void
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
@@ -368,6 +393,17 @@
   g_signal_connect (gtk_icon_theme_get_default(), "changed",
                     G_CALLBACK (on_icon_theme_changed), connection);
 
+  g_dbus_connection_signal_subscribe (connection,
+                                      /*sender*/ NULL,
+                                      /*interface_name*/ "org.freedesktop.DBus",
+                                      /*member*/ "NameOwnerChanged",
+                                      /*object_path*/ "/org/freedesktop/DBus",
+                                      /*arg0*/ "com.canonical.Unity",
+                                      G_DBUS_SIGNAL_FLAGS_NONE,
+                                      on_unity_dbus_name_owner_changed_cb,
+                                      service,
+                                      NULL);
+
   g_debug ("%s", G_STRFUNC);
   g_assert (reg_id > 0);
 }

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2016-08-19 16:11:57 +0000
+++ services/panel-service.c	2017-04-18 10:51:13 +0000
@@ -195,6 +195,14 @@
   G_OBJECT_CLASS (panel_service_parent_class)->dispose (self);
 }
 
+void
+panel_service_clear_remote_data (PanelService *self)
+{
+  g_return_if_fail (PANEL_IS_SERVICE (self));
+
+  g_hash_table_remove_all (self->priv->panel2entries_hash);
+}
+
 static void
 panel_service_class_finalize (GObject *object)
 {

=== modified file 'services/panel-service.h'
--- services/panel-service.h	2014-12-19 16:37:49 +0000
+++ services/panel-service.h	2017-04-18 10:51:13 +0000
@@ -76,6 +76,8 @@
 
 void              panel_service_clear_indicators (PanelService *self);
 
+void              panel_service_clear_remote_data (PanelService *self);
+
 GVariant        * panel_service_sync          (PanelService *self);
 
 GVariant        * panel_service_sync_one      (PanelService *self,

=== modified file 'tests/test_tabiterator.cpp'
--- tests/test_tabiterator.cpp	2013-07-17 23:44:02 +0000
+++ tests/test_tabiterator.cpp	2017-04-18 10:51:13 +0000
@@ -171,9 +171,6 @@
   auto second_entry = IMTextEntryPtr(new IMTextEntry);
   tab_iterator.InsertBefore(second_entry.GetPointer(), first_entry.GetPointer());
 
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
-    tab_iterator.areas_.end(), second_entry.GetPointer());
-
   nux::InputArea* last = tab_iterator.areas_.back();
 
   EXPECT_EQ(second_entry.GetPointer(), last);
@@ -206,9 +203,6 @@
   auto second_entry = IMTextEntryPtr(new IMTextEntry);
   tab_iterator.InsertAfter(second_entry.GetPointer(), first_entry.GetPointer());
 
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
-    tab_iterator.areas_.end(), second_entry.GetPointer());
-
   nux::InputArea* last = tab_iterator.areas_.back();
 
   EXPECT_EQ(second_entry.GetPointer(), last);

=== modified file 'tests/test_thumbnail_generator.cpp'
--- tests/test_thumbnail_generator.cpp	2016-03-31 02:03:55 +0000
+++ tests/test_thumbnail_generator.cpp	2017-04-18 10:51:13 +0000
@@ -58,7 +58,7 @@
   }
 };
 
-void CheckResults(std::vector<LoadResult> const& results, unsigned max_wait = 500)
+void CheckResults(std::vector<LoadResult> const& results, unsigned max_wait = 1500)
 {
   Utils::WaitUntilMSec([&results] {
     bool got_all = true;
@@ -149,7 +149,7 @@
     results[i].cancelled = true;
   }
 
-  CheckResults(results, 15000);
+  CheckResults(results, 30000);
 }
 
 
@@ -206,7 +206,7 @@
     results[i].cancelled = true;
   }
 
-  CheckResults(results);
+  CheckResults(results, 3000);
 }
 
 

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2016-06-27 10:00:13 +0000
+++ unity-shared/UScreen.cpp	2017-04-18 10:51:13 +0000
@@ -170,9 +170,8 @@
 
     float scale = gdk_screen_get_monitor_scale_factor(screen_, i);
     nux::Geometry geo(rect.x, rect.y, rect.width, rect.height);
-    
     nux::Size physical_size(gdk_screen_get_monitor_width_mm(screen_, i),
-      gdk_screen_get_monitor_height_mm(screen_, i));
+                            gdk_screen_get_monitor_height_mm(screen_, i));
 
     if (scale != 1.0)
       geo = geo * scale;