Merge lp:~3v1n0/unity/overlay-disabled-close-button-fix into lp:unity

[Marco Trevisan (Treviño)]

WindowButtons: avoid to disable the Overlay close button.

This fixes a regression I probabily introduced (sorry).

WindowButtons: avoid to disable the Overlay close button.

This fixes a regression I probabily introduced (sorry).

Tests for this are already covered by AP and manual tests.

[Andrea Azzarone (azzar1)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/696/console reported an error when processing this lp:~3v1n0/unity/overlay-disabled-close-button-fix branch.
Not merging it.

=== modified file 'plugins/unityshell/src/WindowButtons.cpp'
--- plugins/unityshell/src/WindowButtons.cpp	2012-04-13 21:08:27 +0000
+++ plugins/unityshell/src/WindowButtons.cpp	2012-04-20 19:20:24 +0000
@@ -530,6 +530,9 @@
 
     if (button)
     {
+      if (button->GetType() == panel::WindowButtonType::CLOSE)
+        button->SetEnabled(true);
+
       if (button->GetType() == panel::WindowButtonType::UNMAXIMIZE)
         restore_button = button;
 
@@ -596,6 +599,21 @@
 
     if (button)
     {
+      if (window_xid_)
+      {
+        if (button->GetType() == panel::WindowButtonType::CLOSE)
+        {
+          bool closable = WindowManager::Default()->IsWindowClosable(window_xid_);
+          button->SetEnabled(closable);
+        }
+
+        if (button->GetType() == panel::WindowButtonType::MINIMIZE)
+        {
+          bool minimizable = WindowManager::Default()->IsWindowMinimizable(window_xid_);
+          button->SetEnabled(minimizable);
+        }
+      }
+
       if (button->GetType() == panel::WindowButtonType::UNMAXIMIZE)
         restore_button = button;
 
@@ -721,20 +739,26 @@
   {
     window_xid_ = xid;
 
-    for (auto area : GetChildren())
+    if (window_xid_ && active_overlay_.empty())
     {
-      auto button = dynamic_cast<WindowButton*>(area);
-
-      if (button->GetType() == panel::WindowButtonType::CLOSE)
-      {
-        bool closable = WindowManager::Default()->IsWindowClosable(xid);
-        button->SetEnabled(closable);
-      }
-
-      if (button->GetType() == panel::WindowButtonType::MINIMIZE)
-      {
-        bool minimizable = WindowManager::Default()->IsWindowMinimizable(xid);
-        button->SetEnabled(minimizable);
+      for (auto area : GetChildren())
+      {
+        auto button = dynamic_cast<WindowButton*>(area);
+
+        if (!button)
+          continue;
+
+        if (button->GetType() == panel::WindowButtonType::CLOSE)
+        {
+          bool closable = WindowManager::Default()->IsWindowClosable(xid);
+          button->SetEnabled(closable);
+        }
+
+        if (button->GetType() == panel::WindowButtonType::MINIMIZE)
+        {
+          bool minimizable = WindowManager::Default()->IsWindowMinimizable(xid);
+          button->SetEnabled(minimizable);
+        }
       }
     }
   }