Merge lp:~3v1n0/unity/panel-titles-fixes into lp:unity

[Marco Trevisan (Treviño)]

PanelMenuView: connect to target window / application title changes

This will be smart enough to work with LIM and global menus

We need to connect to title changes for relevant windows, so we monitor the maximized window on LIM case and the active one otherwise.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3980
http://jenkins.qa.ubuntu.com/job/unity-ci/1199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/86
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/86/console

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Yep, fixes the issue and I see no apparent regressions. Jenkins failure is due to space running out.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3981
http://jenkins.qa.ubuntu.com/job/unity-ci/1226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/2

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

review: Approve (continuous-integration)

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2015-04-22 13:04:53 +0000
+++ panel/PanelMenuView.cpp	2015-04-22 13:04:54 +0000
@@ -272,6 +272,16 @@
   if (old_target != target_window)
   {
     window_buttons_->controlled_window = target_window;
+
+    if (ApplicationWindowPtr const& win = ApplicationManager::Default().GetWindowForId(target_window))
+    {
+      auto refresh_cb = sigc::hide(sigc::mem_fun(this, &PanelMenuView::RefreshAndRedraw));
+      win_name_changed_conn_ = win->title.changed.connect(refresh_cb);
+
+      if (ApplicationPtr const& app = win->application())
+        app_name_changed_conn_ = app->title.changed.connect(refresh_cb);
+    }
+
     ClearEntries();
 
     if (indicator::AppmenuIndicator::Ptr appmenu = menu_manager_->AppMenu())
@@ -771,7 +781,7 @@
       return "";
     }
 
-    if (WindowManager::Default().IsWindowMaximized(window_xid) && !use_appname)
+    if (window_xid == maximized_window() && !use_appname)
       label = window->title();
 
     if (label.empty())
@@ -1029,10 +1039,6 @@
 {
   if (new_app)
   {
-    app_name_changed_conn_ = new_app->title.changed.connect([this] (std::string const&t) {
-      RefreshAndRedraw();
-    });
-
     if (integrated_menus_ || always_show_menus_)
       return;
 
@@ -1095,11 +1101,6 @@
       maximized_wins_.push_front(active_xid);
       UpdateMaximizedWindow();
     }
-
-    // register callback for new view
-    win_name_changed_conn_ = new_win->title.changed.connect([this] (std::string const& t) {
-      RefreshAndRedraw();
-    });
   }
 
   active_window = active_xid;

=== modified file 'unity-shared/BamfApplicationManager.cpp'
--- unity-shared/BamfApplicationManager.cpp	2015-04-22 13:04:53 +0000
+++ unity-shared/BamfApplicationManager.cpp	2015-04-22 13:04:54 +0000
@@ -640,7 +640,13 @@
   if (xid == 0)
     return nullptr;
 
-  std::shared_ptr<GList> windows(bamf_matcher_get_windows(matcher_), g_list_free);
+  // TODO: use bamf_matcher_get_window_for_xid
+  auto* app = bamf_matcher_get_application_for_xid(matcher_, xid);
+
+  if (!app)
+    return nullptr;
+
+  std::shared_ptr<GList> windows(bamf_view_get_children(reinterpret_cast<BamfView*>(app)), g_list_free);
 
   for (GList* l = windows.get(); l; l = l->next)
   {