Merge lp:~cimi/unity/unity.fix-836655_and_fix-838875 into lp:unity

[Andrea Cimitan]

Update assets and new behavior

=== added file 'plugins/unityshell/resources/close_dash.png'
 Binary files plugins/unityshell/resources/close_dash.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/close_dash.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/close_dash_prelight.png'
 Binary files plugins/unityshell/resources/close_dash_prelight.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/close_dash_prelight.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/close_dash_pressed.png'
 Binary files plugins/unityshell/resources/close_dash_pressed.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/close_dash_pressed.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/maximize_dash.png'
 Binary files plugins/unityshell/resources/maximize_dash.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/maximize_dash.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/maximize_dash_prelight.png'
 Binary files plugins/unityshell/resources/maximize_dash_prelight.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/maximize_dash_prelight.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/maximize_dash_pressed.png'
 Binary files plugins/unityshell/resources/maximize_dash_pressed.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/maximize_dash_pressed.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/minimize_dash.png'
 Binary files plugins/unityshell/resources/minimize_dash.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/minimize_dash.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/minimize_dash_prelight.png'
 Binary files plugins/unityshell/resources/minimize_dash_prelight.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/minimize_dash_prelight.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/minimize_dash_pressed.png'
 Binary files plugins/unityshell/resources/minimize_dash_pressed.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/minimize_dash_pressed.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/unmaximize_dash.png'
 Binary files plugins/unityshell/resources/unmaximize_dash.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/unmaximize_dash.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/unmaximize_dash_prelight.png'
 Binary files plugins/unityshell/resources/unmaximize_dash_prelight.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/unmaximize_dash_prelight.png	2011-09-01 17:04:25 +0000 differ
=== added file 'plugins/unityshell/resources/unmaximize_dash_pressed.png'
 Binary files plugins/unityshell/resources/unmaximize_dash_pressed.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/unmaximize_dash_pressed.png	2011-09-01 17:04:25 +0000 differ
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-08-25 18:25:25 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-09-01 17:04:25 +0000
@@ -969,7 +969,8 @@
 {
   if (_places_showing)
   {
-    DashSettings::GetDefault()->SetFormFactor(DashSettings::DESKTOP);
+    // no action when dash is opened, LP bug #838875
+    return;
   }
   else
   {
@@ -986,7 +987,10 @@
 {
   if (_places_showing)
   {
-    DashSettings::GetDefault()->SetFormFactor(DashSettings::NETBOOK);
+    if (DashSettings::GetDefault()->GetFormFactor() == DashSettings::DESKTOP)
+      DashSettings::GetDefault()->SetFormFactor(DashSettings::NETBOOK);
+    else
+      DashSettings::GetDefault()->SetFormFactor(DashSettings::DESKTOP);
   }
   else
   {
 
=== modified file 'plugins/unityshell/src/WindowButtons.cpp'
--- plugins/unityshell/src/WindowButtons.cpp	2011-08-19 15:17:30 +0000
+++ plugins/unityshell/src/WindowButtons.cpp	2011-09-01 17:04:25 +0000
@@ -16,6 +16,8 @@
  * Authored by: Neil Jagdish Patel <[e-mail]>
  */
 
+#include "config.h"
+
 #include "Nux/Nux.h"
 #include "Nux/HLayout.h"
 #include "Nux/VLayout.h"
@@ -28,9 +30,16 @@
 #include <UnityCore/Variant.h>
 #include "WindowButtons.h"
 
-#include <glib.h>
+#include "ubus-server.h"
+#include "UBusMessages.h"
 
+#include "DashSettings.h"
 #include "PanelStyle.h"
+
+#include <UnityCore/GLibWrapper.h>
+
+using namespace unity;
+
 class WindowButton : public nux::Button
 {
   // A single window button
@@ -40,10 +49,25 @@
       _type(type),
       _normal_tex(NULL),
       _prelight_tex(NULL),
-      _pressed_tex(NULL)
+      _pressed_tex(NULL),
+      _normal_dash_tex(NULL),
+      _prelight_dash_tex(NULL),
+      _pressed_dash_tex(NULL),
+      _dash_is_open(false),
+      _place_shown_interest(0),
+      _place_hidden_interest(0)
   {
     LoadImages();
     PanelStyle::GetDefault()->changed.connect(sigc::mem_fun(this, &WindowButton::LoadImages));
+    DashSettings::GetDefault()->changed.connect(sigc::mem_fun(this, &WindowButton::UpdateDashUnmaximize));
+
+    UBusServer* ubus = ubus_server_get_default();
+    _place_shown_interest = ubus_server_register_interest(ubus, UBUS_PLACE_VIEW_SHOWN,
+                                                          (UBusCallback)&WindowButton::OnPlaceViewShown,
+                                                          this);
+    _place_hidden_interest = ubus_server_register_interest(ubus, UBUS_PLACE_VIEW_HIDDEN,
+                                                           (UBusCallback)&WindowButton::OnPlaceViewHidden,
+                                                           this);
   }
 
   ~WindowButton()
@@ -51,27 +75,42 @@
     _normal_tex->UnReference();
     _prelight_tex->UnReference();
     _pressed_tex->UnReference();
+    _normal_dash_tex->UnReference();
+    _prelight_dash_tex->UnReference();
+    _pressed_dash_tex->UnReference();
+
+    UBusServer* ubus = ubus_server_get_default();
+    if (_place_shown_interest != 0)
+      ubus_server_unregister_interest(ubus, _place_shown_interest);
+    if (_place_hidden_interest != 0)
+      ubus_server_unregister_interest(ubus, _place_hidden_interest);
   }
 
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
   {
-    nux::Geometry      geo  = GetGeometry();
+    nux::Geometry      geo = GetGeometry();
     nux::BaseTexture*  tex;
     nux::TexCoordXForm texxform;
 
     GfxContext.PushClippingRectangle(geo);
 
-    if (HasMouseFocus() && IsMouseInside())
-    {
-      tex = _pressed_tex;
-    }
-    else if (IsMouseInside())
-    {
-      tex = _prelight_tex;
+    if (_dash_is_open)
+    {
+      if (HasMouseFocus() && IsMouseInside())
+        tex = _pressed_dash_tex;
+      else if (IsMouseInside())
+        tex = _prelight_dash_tex;
+      else
+        tex = _normal_dash_tex;
     }
     else
     {
-      tex = _normal_tex;
+      if (HasMouseFocus() && IsMouseInside())
+        tex = _pressed_tex;
+      else if (IsMouseInside())
+        tex = _prelight_tex;
+      else
+        tex = _normal_tex;
     }
 
     GfxContext.GetRenderStates().SetBlend(true);
@@ -99,13 +138,70 @@
       _prelight_tex->UnReference();
     if (_pressed_tex)
       _pressed_tex->UnReference();
+    if (_normal_dash_tex)
+      _normal_dash_tex->UnReference();
+    if (_prelight_dash_tex)
+      _prelight_dash_tex->UnReference();
+    if (_pressed_dash_tex)
+      _pressed_dash_tex->UnReference();
 
     _normal_tex = style->GetWindowButton(_type, PanelStyle::WINDOW_STATE_NORMAL);
     _prelight_tex = style->GetWindowButton(_type, PanelStyle::WINDOW_STATE_PRELIGHT);
     _pressed_tex = style->GetWindowButton(_type, PanelStyle::WINDOW_STATE_PRESSED);
-
-    if (_normal_tex)
-      SetMinMaxSize(_normal_tex->GetWidth(), _normal_tex->GetHeight());
+    _normal_dash_tex = GetDashWindowButton(_type, PanelStyle::WINDOW_STATE_NORMAL);
+    _prelight_dash_tex = GetDashWindowButton(_type, PanelStyle::WINDOW_STATE_PRELIGHT);
+    _pressed_dash_tex = GetDashWindowButton(_type, PanelStyle::WINDOW_STATE_PRESSED);
+
+    if (_dash_is_open)
+    {
+      if (_normal_dash_tex)
+        SetMinMaxSize(_normal_dash_tex->GetWidth(), _normal_dash_tex->GetHeight());
+    }
+    else
+    {
+      if (_normal_tex)
+        SetMinMaxSize(_normal_tex->GetWidth(), _normal_tex->GetHeight());
+    }
+
+    QueueDraw();
+  }
+
+  void UpdateDashUnmaximize()
+  {
+    // only update the unmaximize button
+    if (_type != PanelStyle::WINDOW_BUTTON_UNMAXIMIZE)
+      return;
+
+    if (_normal_dash_tex)
+      _normal_dash_tex->UnReference();
+    if (_prelight_dash_tex)
+      _prelight_dash_tex->UnReference();
+    if (_pressed_dash_tex)
+      _pressed_dash_tex->UnReference();
+
+    if (DashSettings::GetDefault()->GetFormFactor() == DashSettings::DESKTOP)
+    {
+      // get maximize buttons
+      _normal_dash_tex = GetDashMaximizeWindowButton(PanelStyle::WINDOW_STATE_NORMAL);
+      _prelight_dash_tex = GetDashMaximizeWindowButton(PanelStyle::WINDOW_STATE_PRELIGHT);
+      _pressed_dash_tex = GetDashMaximizeWindowButton(PanelStyle::WINDOW_STATE_PRESSED);
+    }
+    else
+    {
+      // get unmaximize buttons
+      _normal_dash_tex = GetDashWindowButton(_type, PanelStyle::WINDOW_STATE_NORMAL);
+      _prelight_dash_tex = GetDashWindowButton(_type, PanelStyle::WINDOW_STATE_PRELIGHT);
+      _pressed_dash_tex = GetDashWindowButton(_type, PanelStyle::WINDOW_STATE_PRESSED);
+    }
+
+    // still check if the dash is really opened,
+    // someone could change the form factor through dconf
+    // when the dash is closed
+    if (_dash_is_open)
+    {
+      if (_normal_dash_tex)
+        SetMinMaxSize(_normal_dash_tex->GetWidth(), _normal_dash_tex->GetHeight());
+    }
 
     QueueDraw();
   }
@@ -115,6 +211,67 @@
   nux::BaseTexture* _normal_tex;
   nux::BaseTexture* _prelight_tex;
   nux::BaseTexture* _pressed_tex;
+  nux::BaseTexture* _normal_dash_tex;
+  nux::BaseTexture* _prelight_dash_tex;
+  nux::BaseTexture* _pressed_dash_tex;
+  bool _dash_is_open;
+  guint32 _place_shown_interest;
+  guint32 _place_hidden_interest;
+
+  static void OnPlaceViewShown(GVariant* data, void* val)
+  {
+    WindowButton* self = (WindowButton*)val;
+
+    self->_dash_is_open = true;
+    if (self->_normal_dash_tex)
+      self->SetMinMaxSize(self->_normal_dash_tex->GetWidth(), self->_normal_dash_tex->GetHeight());
+
+    self->QueueDraw();
+  }
+
+  static void OnPlaceViewHidden(GVariant* data, void* val)
+  {
+    WindowButton* self = (WindowButton*)val;
+
+    self->_dash_is_open = false;
+    if (self->_normal_tex)
+      self->SetMinMaxSize(self->_normal_tex->GetWidth(), self->_normal_tex->GetHeight());
+
+    self->QueueDraw();
+  }
+
+  nux::BaseTexture* GetDashWindowButton(PanelStyle::WindowButtonType type, PanelStyle::WindowState state)
+  {
+    const char* names[] = { "close_dash", "minimize_dash", "unmaximize_dash" };
+    const char* states[] = { "", "_prelight", "_pressed" };
+
+    std::ostringstream subpath;
+    subpath << names[type] << states[state] << ".png";
+
+    glib::String filename(g_build_filename(PKGDATADIR, subpath.str().c_str(), NULL));
+
+    glib::Error error;
+    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file(filename.Value(), &error));
+
+    // not handling broken texture or missing files
+    return nux::CreateTexture2DFromPixbuf(pixbuf, true);
+  }
+
+  nux::BaseTexture* GetDashMaximizeWindowButton(PanelStyle::WindowState state)
+  {
+    const char* states[] = { "", "_prelight", "_pressed" };
+
+    std::ostringstream subpath;
+    subpath << "maximize_dash" << states[state] << ".png";
+
+    glib::String filename(g_build_filename(PKGDATADIR, subpath.str().c_str(), NULL));
+
+    glib::Error error;
+    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file(filename.Value(), &error));
+
+    // not handling broken texture or missing files
+    return nux::CreateTexture2DFromPixbuf(pixbuf, true);
+  }
 };
 
 
 
=== modified file 'plugins/unityshell/src/WindowButtons.h'
--- plugins/unityshell/src/WindowButtons.h	2011-08-10 18:42:00 +0000
+++ plugins/unityshell/src/WindowButtons.h	2011-09-01 17:04:25 +0000
@@ -44,7 +44,6 @@
   const gchar* GetChildsName();
   void          AddProperties(GVariantBuilder* builder);
 
-
 private:
   void OnCloseClicked(nux::View *view);
   void OnMinimizeClicked(nux::View *view);