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

[Marco Trevisan (Treviño)]

PanelMenuView: ensure that proper window tiles and buttons are shown at the right place

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3890
http://jenkins.qa.ubuntu.com/job/unity-ci/1110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/197

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3890
http://jenkins.qa.ubuntu.com/job/unity-ci/1111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/198

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

+1

review: Approve

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2014-09-17 03:48:40 +0000
+++ panel/PanelMenuView.cpp	2014-10-24 16:32:57 +0000
@@ -275,6 +275,9 @@
   if (!mouse_inside)
     return nullptr;
 
+  if (WindowManager::Default().IsExpoActive())
+    return nullptr;
+
   Area* found_area = nullptr;
 
   if (!integrated_menus_ && !we_control_active_ && !spread_showing_)
@@ -386,14 +389,12 @@
 
 bool PanelMenuView::ShouldDrawButtons() const
 {
+  if (spread_showing_)
+    return true;
+
   if (integrated_menus_)
   {
-    if (spread_showing_)
-      return true;
-
-    WindowManager& wm = WindowManager::Default();
-
-    if (!wm.IsExpoActive() && !wm.IsScaleActive())
+    if (!WindowManager::Default().IsExpoActive())
       return (GetMaximizedWindow() != 0);
 
     return false;
@@ -401,9 +402,7 @@
 
   if (we_control_active_ && is_maximized_ && !launcher_keynav_ && !switcher_showing_)
   {
-    WindowManager& wm = WindowManager::Default();
-
-    if (!wm.IsExpoActive())
+    if (!WindowManager::Default().IsExpoActive())
     {
       if (is_inside_ || show_now_activated_ || new_application_)
         return true;
@@ -413,9 +412,6 @@
     }
   }
 
-  if (spread_showing_)
-    return true;
-
   return false;
 }
 
@@ -821,7 +817,7 @@
   auto state = WidgetState::NORMAL;
   float dpi_scale = Settings::Instance().em(monitor_)->DPIScale();
 
-  if (integrated_menus_ && !is_desktop_focused_ && !WindowManager::Default().IsScaleActive())
+  if (integrated_menus_ && !is_desktop_focused_ && !WindowManager::Default().IsExpoActive())
   {
     title_geo_.x = geo.x + window_buttons_->GetBaseWidth() + (style->TitleIndent() * dpi_scale);
 
@@ -854,10 +850,9 @@
 {
   if (integrated_menus_ || (!switcher_showing_ && !launcher_keynav_))
   {
-    WindowManager& wm = WindowManager::Default();
     std::string new_title;
 
-    if (wm.IsExpoActive())
+    if (WindowManager::Default().IsExpoActive())
     {
       new_title = desktop_name_;
     }
@@ -1129,7 +1124,10 @@
     }
 
     if (is_maximized_)
-      maximized_set_.insert(active_xid_);
+    {
+      maximized_wins_.erase(std::remove(maximized_wins_.begin(), maximized_wins_.end(), active_xid_), maximized_wins_.end());
+      maximized_wins_.push_front(active_xid_);
+    }
 
     // register callback for new view
     view_name_changed_signal_.Connect(new_view, "name-changed",
@@ -1185,7 +1183,7 @@
 
 void PanelMenuView::OnWindowMinimized(Window xid)
 {
-  maximized_set_.erase(xid);
+  maximized_wins_.erase(std::remove(maximized_wins_.begin(), maximized_wins_.end(), xid), maximized_wins_.end());
 
   if (xid == active_xid_)
   {
@@ -1201,18 +1199,24 @@
 
 void PanelMenuView::OnWindowUnminimized(Window xid)
 {
-  if (WindowManager::Default().IsWindowMaximized(xid))
-    maximized_set_.insert(xid);
-
   if (xid == active_xid_)
   {
+    if (WindowManager::Default().IsWindowMaximized(xid))
+      maximized_wins_.push_front(xid);
+
     if (Refresh())
       QueueDraw();
   }
-  else if (integrated_menus_ && IsWindowUnderOurControl(xid))
+  else
   {
-    if (Refresh())
-      QueueDraw();
+    if (WindowManager::Default().IsWindowMaximized(xid))
+      maximized_wins_.push_back(xid);
+
+    if (integrated_menus_ && IsWindowUnderOurControl(xid))
+    {
+      if (Refresh())
+        QueueDraw();
+    }
   }
 }
 
@@ -1220,7 +1224,7 @@
 {
   // FIXME: compiz doesn't give us a valid xid (is always 0 on unmap)
   // we need to do this again on BamfView closed signal.
-  maximized_set_.erase(xid);
+  maximized_wins_.erase(std::remove(maximized_wins_.begin(), maximized_wins_.end(), xid), maximized_wins_.end());
 
   if (xid == active_xid_)
   {
@@ -1238,22 +1242,26 @@
 {
   if (WindowManager::Default().IsWindowMaximized(xid))
   {
-    maximized_set_.insert(xid);
-
     if (xid == active_xid_)
     {
+      maximized_wins_.push_front(xid);
+
       if (Refresh())
         QueueDraw();
     }
+    else
+    {
+      maximized_wins_.push_back(xid);
+    }
   }
 }
 
 void PanelMenuView::OnWindowMaximized(Window xid)
 {
-  maximized_set_.insert(xid);
-
   if (xid == active_xid_)
   {
+    maximized_wins_.push_front(xid);
+
     // We need to update the is_inside_ state in the case of maximization by grab
     auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
     is_inside_ = GetAbsoluteGeometry().IsInside(mouse);
@@ -1262,16 +1270,21 @@
     if (Refresh())
       FullRedraw();
   }
-  else if (integrated_menus_ && IsWindowUnderOurControl(xid))
+  else
   {
-    if (Refresh())
-      QueueDraw();
+    maximized_wins_.push_back(xid);
+
+    if (integrated_menus_ && IsWindowUnderOurControl(xid))
+    {
+      if (Refresh())
+        QueueDraw();
+    }
   }
 }
 
 void PanelMenuView::OnWindowRestored(Window xid)
 {
-  maximized_set_.erase(xid);
+  maximized_wins_.erase(std::remove(maximized_wins_.begin(), maximized_wins_.end(), xid), maximized_wins_.end());
 
   if (active_xid_ == xid)
   {
@@ -1370,7 +1383,7 @@
   Window window_xid = 0;
 
   // Find the front-most of the maximized windows we are controlling
-  for (auto xid : maximized_set_)
+  for (auto xid : maximized_wins_)
   {
     // We can safely assume only the front-most is visible
     if (IsValidWindow(xid))
@@ -1795,8 +1808,8 @@
 {
   PanelIndicatorsView::SetMonitor(monitor);
 
+  maximized_wins_.clear();
   monitor_geo_ = UScreen::GetDefault()->GetMonitorGeometry(monitor_);
-  maximized_set_.clear();
   GList* windows = bamf_matcher_get_window_stack_for_monitor(matcher_, monitor_);
 
   for (GList* l = windows; l; l = l->next)
@@ -1806,12 +1819,18 @@
 
     auto window = static_cast<BamfWindow*>(l->data);
     auto view = static_cast<BamfView*>(l->data);
+    auto xid = bamf_window_get_xid(window);
 
     if (bamf_view_is_active(view))
-      active_xid_ = bamf_window_get_xid(window);
+      active_xid_ = xid;
 
     if (bamf_window_maximized(window) == BAMF_WINDOW_MAXIMIZED)
-      maximized_set_.insert(bamf_window_get_xid(window));
+    {
+      if (xid == active_xid_)
+        maximized_wins_.push_front(xid);
+      else
+        maximized_wins_.push_back(xid);
+    }
   }
 
   Window maximized = GetMaximizedWindow();
 
=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2014-09-16 06:14:33 +0000
+++ panel/PanelMenuView.h	2014-10-24 16:32:57 +0000
@@ -170,7 +170,7 @@
   bool is_desktop_focused_;
 
   PanelIndicatorEntryView* last_active_view_;
-  std::set<Window> maximized_set_;
+  std::deque<Window> maximized_wins_;
   glib::Object<BamfApplication> new_application_;
   std::list<glib::Object<BamfApplication>> new_apps_;
   std::string panel_title_;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-10-24 16:32:57 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-10-24 16:32:57 +0000
@@ -542,7 +542,7 @@
 
       for (auto const& swin : sScreen->getWindows())
       {
-        if (std::find(filtered_windows.begin(), filtered_windows.end(), swin->window->id()) != filtered_windows.end())
+        if (filtered_windows.find(swin->window->id()) != filtered_windows.end())
           continue;
 
         auto* uwin = UnityWindow::get(swin->window);
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-08-13 23:32:39 +0000
+++ unity-shared/PluginAdapter.cpp	2014-10-24 16:32:57 +0000
@@ -554,9 +554,10 @@
 
 bool PluginAdapter::IsWindowObscured(Window window_id) const
 {
-  CompWindow* window = m_Screen->findWindow(window_id);
+  if (_spread_state)
+    return false;
 
-  if (window)
+  if (CompWindow* window = m_Screen->findWindow(window_id))
   {
     if (window->inShowDesktopMode())
       return true;