Merge lp:~uriboni/unity/unity-drag-shadow into lp:unity

[Ugo Riboni]

Add a shadow below the icon when it's being dragged out from the launcher.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for the branch, however it simply does not work as expected here: when I drag an icon out from the launcher, I get nothing painted on the screen, but one small pixel.
The problems seems to be in
SetBaseSize(DROP_SHADOW_SIZE * widthFactor, DROP_SHADOW_SIZE * heightFactor);

Also:
31 + glib::Error error;
32 + glib::Object<GdkPixbuf> pbuf(gdk_pixbuf_new_from_file_at_size(PKGDATADIR "/ordering_shadow.png",
33 + DROP_SHADOW_SIZE, DROP_SHADOW_SIZE, &error));

Since you don't LOG_ERROR the error, you can avoid to use it... Just pass nullptr to gdk_pixbuf_new_from_file_at_size

Also, instead of adding a new pixbuf, what about using the PKGDATADIR"/launcher_icon_shadow_200.png" or PKGDATADIR"/launcher_icon_shadow_62.png" textures that the AbstractIconRender is alredy using? So they will always match...

34 + if (GDK_IS_PIXBUF(pbuf.RawPtr()))

Use the nwe pbuf.IsType(GDK_TYPE_PIXBUF)

+ nux::BaseTexture* texture = nux::CreateTexture2DFromPixbuf(pbuf, true);

This should be unreferenced... You can just use a nux::ObjectPtr to handle it and forget.

PS: instead of checking != nullptr we prefer to have simple (check) or (!check) ;)

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Ugo, FYI this diff fixes the issues above: http://paste.ubuntu.com/1144653/ (the size problem I had was caused by a division with an integer).

However, I'm still not getting the correct design when dragging the icon outside the launcher: http://i.imgur.com/ALpcH.png

[lp:~uriboni/unity/unity-drag-shadow]

2546. By Ugo Riboni on 2012-08-17

Merge changes from trunk

2547. By Ugo Riboni on 2012-08-17

Use proper flat math and properly handle adopted textures. Thanks Treviño.

[Andrea Azzarone (azzar1)]

Fixed in trunk.

Unmerged revisions

2547. By Ugo Riboni on 2012-08-17

Use proper flat math and properly handle adopted textures. Thanks Treviño.

2546. By Ugo Riboni on 2012-08-17

Merge changes from trunk

2545. By Ugo Riboni on 2012-08-10

Remove another unnecessary include

2544. By Ugo Riboni on 2012-08-10

Minimize whitespace changes

2543. By Ugo Riboni on 2012-08-10

Use same indent style as the rest of the file

2542. By Ugo Riboni on 2012-08-10

Remove useless includes and use constants instead of defines

2541. By Ugo Riboni on 2012-08-09

Add a drop shadow below the icon when it's dragged out from the launcher

=== modified file 'launcher/LauncherDragWindow.cpp'
--- launcher/LauncherDragWindow.cpp	2012-06-18 02:57:23 +0000
+++ launcher/LauncherDragWindow.cpp	2012-08-20 15:04:27 +0000
@@ -17,6 +17,7 @@
 * Authored by: Jason Smith <[e-mail]>
 */
 
+#include "config.h"
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 #include <NuxGraphics/GraphicsEngine.h>
@@ -29,13 +30,32 @@
 namespace launcher
 {
 
+static const int DEFAULT_TILE_HEIGHT = 56;
+static const int DEFAULT_TILE_WIDTH = 56;
+static const int DROP_SHADOW_SIZE = 76;
+
 NUX_IMPLEMENT_OBJECT_TYPE(LauncherDragWindow);
 
 LauncherDragWindow::LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> icon)
   : nux::BaseWindow("")
   , _icon(icon)
 {
-  SetBaseSize(_icon->GetWidth(), _icon->GetHeight());
+  float heightFactor = _icon->GetHeight() / static_cast<float>(DEFAULT_TILE_HEIGHT);
+  float widthFactor = _icon->GetWidth() / static_cast<float>(DEFAULT_TILE_WIDTH);
+  SetBaseSize(DROP_SHADOW_SIZE * widthFactor, DROP_SHADOW_SIZE *  heightFactor);
+
+  glib::Object<GdkPixbuf> pbuf(gdk_pixbuf_new_from_file_at_size(PKGDATADIR "/ordering_shadow.png",
+                                                                DROP_SHADOW_SIZE, DROP_SHADOW_SIZE, nullptr));
+  if (pbuf.IsType(GDK_TYPE_PIXBUF))
+  {
+    nux::ObjectPtr<nux::BaseTexture> texture;
+    texture.Adopt(nux::CreateTexture2DFromPixbuf(pbuf, true));
+
+    if (texture)
+    {
+      _drop_shadow = texture->GetDeviceTexture();
+    }
+  }
 }
 
 LauncherDragWindow::~LauncherDragWindow()
@@ -105,10 +125,20 @@
   GfxContext.PushClippingRectangle(geo);
 
   nux::TexCoordXForm texxform;
+  if (_drop_shadow)
+  {
+    GfxContext.QRP_1Tex(0,
+                        0,
+                        geo.width,
+                        geo.height,
+                        _drop_shadow,
+                        texxform,
+                        nux::color::White);
+  }
+
   texxform.FlipVCoord(true);
-
-  GfxContext.QRP_1Tex(0,
-                      0,
+  GfxContext.QRP_1Tex((geo.width - _icon->GetWidth()) / 2.0f,
+                      (geo.height - _icon->GetHeight()) / 2.0f,
                       _icon->GetWidth(),
                       _icon->GetHeight(),
                       _icon,

=== modified file 'launcher/LauncherDragWindow.h'
--- launcher/LauncherDragWindow.h	2012-06-18 02:57:23 +0000
+++ launcher/LauncherDragWindow.h	2012-08-20 15:04:27 +0000
@@ -54,6 +54,7 @@
   bool OnAnimationTimeout();
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> _icon;
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> _drop_shadow;
   nux::Point2 _animation_target;
   glib::Source::UniquePtr animation_timer_;
 };

=== added file 'plugins/unityshell/resources/ordering_shadow.png'
Binary files plugins/unityshell/resources/ordering_shadow.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/ordering_shadow.png	2012-08-20 15:04:27 +0000 differ