Merge lp:~3v1n0/unity/disabled-close-winbutton-support into lp:unity

[Marco Trevisan (Treviño)]

WindowButtons: disable the close button if the controlled window is not closable

Added support to WindowManager to get if a window is closable and maximizable, then used the IsWindowClosable method to enable or disable the close window button.

Added support to WindowManager to get if a window is closable and maximizable, then used the IsWindowClosable method to enable or disable the close window button.

This is needed by few applications that disable the close button, and it's currently quite hard to test with AP due to the missing test cases (one is the Updates Manager's packages cache updater, but only after enlarging the detailed view).
Anyway this exact behavior is already tested with AP for the not-minimizable windows.
That's why I'm including here a manual test.

[Brandon Schaefer (brandontschaefer)]

Confirmed working.

review: Approve

[Thomi Richards (thomir-deactivatedaccount)]

Approved with a manual test since we don't yet have the ability to generate windows with arbitrary features (It's on the TODO list).

review: Approve

=== added file 'manual-tests/WindowButtons.txt'
--- manual-tests/WindowButtons.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/WindowButtons.txt	2012-04-13 22:06:26 +0000
@@ -0,0 +1,11 @@
+Window Close Button should be Disabled if not available
+-------------------------------------------------------
+
+Actions:  
+ * Start the Update Manager
+ * Press on the "Check" button
+ * On the "Updating Chache" dialog, press the "Details" toggle
+ * Press on the maximize window button that will show on the dialog decoration
+
+Expected Result:
+ * The close window button should be shown as disabled (grayed)

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-04-02 10:45:47 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2012-04-13 22:06:26 +0000
@@ -522,6 +522,19 @@
 }
 
 bool
+PluginAdapter::IsWindowClosable(guint32 xid)
+{
+  Window win = xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (window)
+    return (window->actions() & CompWindowActionCloseMask);
+
+  return false;
+}
+
+bool
 PluginAdapter::IsWindowMinimizable(guint32 xid)
 {
   Window win = xid;
@@ -534,6 +547,19 @@
   return false;
 }
 
+bool
+PluginAdapter::IsWindowMaximizable(guint32 xid)
+{
+  Window win = xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (window)
+    return (window->actions() & MAXIMIZABLE);
+
+  return false;
+}
+
 void
 PluginAdapter::Restore(guint32 xid)
 {

=== modified file 'plugins/unityshell/src/PluginAdapter.h'
--- plugins/unityshell/src/PluginAdapter.h	2012-04-02 10:45:47 +0000
+++ plugins/unityshell/src/PluginAdapter.h	2012-04-13 22:06:26 +0000
@@ -119,7 +119,9 @@
   bool IsWindowObscured(guint xid);
   bool IsWindowMapped(guint xid);
   bool IsWindowVisible(guint32 xid);
+  bool IsWindowClosable(guint32 xid);
   bool IsWindowMinimizable(guint32 xid);
+  bool IsWindowMaximizable(guint32 xid);
 
   void Restore(guint32 xid);
   void RestoreAt(guint32 xid, int x, int y);

=== modified file 'plugins/unityshell/src/WindowButtons.cpp'
--- plugins/unityshell/src/WindowButtons.cpp	2012-04-04 20:13:10 +0000
+++ plugins/unityshell/src/WindowButtons.cpp	2012-04-13 22:06:26 +0000
@@ -725,11 +725,16 @@
     {
       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);
-        break;
       }
     }
   }

=== modified file 'plugins/unityshell/src/WindowManager.cpp'
--- plugins/unityshell/src/WindowManager.cpp	2012-04-02 10:45:47 +0000
+++ plugins/unityshell/src/WindowManager.cpp	2012-04-13 22:06:26 +0000
@@ -73,11 +73,21 @@
     return true;
   }
 
+  bool IsWindowClosable(guint32 xid)
+  {
+    return true;
+  }
+
   bool IsWindowMinimizable(guint32 xid)
   {
     return true;
   }
 
+  bool IsWindowMaximizable(guint32 xid)
+  {
+    return true;
+  }
+
   void Restore(guint32 xid)
   {
     g_debug("%s", G_STRFUNC);

=== modified file 'plugins/unityshell/src/WindowManager.h'
--- plugins/unityshell/src/WindowManager.h	2012-04-02 10:45:47 +0000
+++ plugins/unityshell/src/WindowManager.h	2012-04-13 22:06:26 +0000
@@ -61,7 +61,9 @@
   virtual bool IsWindowObscured(guint32 xid) = 0;
   virtual bool IsWindowMapped(guint32 xid) = 0;
   virtual bool IsWindowVisible(guint32 xid) = 0;
+  virtual bool IsWindowClosable(guint32 xid) = 0;
   virtual bool IsWindowMinimizable(guint32 xid) = 0;
+  virtual bool IsWindowMaximizable(guint32 xid) = 0;
 
   virtual void ShowDesktop() = 0;