Merge lp:~nick-dedekind/unity/lp765715.launcher-icon-shadow into lp:unity

[Nick Dedekind]

Increase the size of the launcher icon drag window so the shadow is not cut off.

= Problem description =

https://bugs.launchpad.net/unity/+bug/765715
A shadow should appear on the right and bottom sides of a dragged launcher icon.

= The fix =

Increase the size of the launcher icon drag window so the shadow is not cut off.
Refactored drag launcher window to conform to unity variable naming conventions.

= Test coverage =

No test. Visual change.

https://bugs.launchpad.net/unity/+bug/765715/+attachment/3424675/+files/shadow.png

[Andrea Azzarone (azzar1)]

17 - , _render_drag_window(false)

Do we need to remove it from Launcher.h too?

295 + * Copyright (C) 2010 Canonical Ltd

2010? :)

348 + g_assert(rendering_stack.size() > 0);
351 + if (rendering_stack.size() > 0)

Please use std::stack::empty here.

review: Approve

[John Lea (johnlea)]

review: Approve (design)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-10-31 20:34:34 +0000
+++ launcher/Launcher.cpp	2012-11-01 08:29:20 +0000
@@ -49,6 +49,8 @@
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UnitySettings.h"
+#include "unity-shared/GraphicsUtils.h"
+
 
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
@@ -114,7 +116,6 @@
   , _active_quicklist(nullptr)
   , _hovered(false)
   , _hidden(false)
-  , _render_drag_window(false)
   , _shortcuts_shown(false)
   , _data_checked(false)
   , _steal_drag(false)
@@ -152,8 +153,6 @@
 
   _collection_window->collected.connect(sigc::mem_fun(this, &Launcher::OnDNDDataCollected));
 
-  _offscreen_drag_texture = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, nux::BITFMT_R8G8B8A8);
-
   bg_effect_helper_.owner = this;
   bg_effect_helper_.enabled = false;
 
@@ -1757,13 +1756,6 @@
   nux::Geometry const& geo_absolute = GetAbsoluteGeometry();
   RenderArgs(args, bkg_box, &launcher_alpha, geo_absolute);
   bkg_box.width -= RIGHT_LINE_WIDTH;
-
-  if (_drag_icon && _render_drag_window)
-  {
-    RenderIconToTexture(GfxContext, _drag_icon, _offscreen_drag_texture);
-    _render_drag_window = false;
-    ShowDragWindow();
-  }
   
   nux::Color clear_colour = nux::Color(0x00000000);
   
@@ -2030,10 +2022,10 @@
   _drag_icon_position = _model->IconIndex(icon);
 
   HideDragWindow();
-  _offscreen_drag_texture = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(_icon_size, _icon_size, 1, nux::BITFMT_R8G8B8A8);
+  _offscreen_drag_texture = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(GetWidth(), GetWidth(), 1, nux::BITFMT_R8G8B8A8);
   _drag_window = new LauncherDragWindow(_offscreen_drag_texture);
-
-  _render_drag_window = true;
+  RenderIconToTexture(nux::GetWindowThread()->GetGraphicsEngine(), _drag_icon, _offscreen_drag_texture);
+  ShowDragWindow();
 
   ubus_.SendMessage(UBUS_LAUNCHER_ICON_START_DND);
 }
@@ -2077,8 +2069,6 @@
   if (MouseBeyondDragThreshold())
     TimeUtil::SetTimeStruct(&_times[TIME_DRAG_THRESHOLD], &_times[TIME_DRAG_THRESHOLD], ANIM_DURATION_SHORT);
 
-  _render_drag_window = false;
-
   _hide_machine.SetQuirk(LauncherHideMachine::INTERNAL_DND_ACTIVE, false);
   ubus_.SendMessage(UBUS_LAUNCHER_ICON_END_DND);
 }
@@ -2503,7 +2493,7 @@
   clock_gettime(CLOCK_MONOTONIC, &current);
 
   SetupRenderArg(icon, current, arg);
-  arg.render_center = nux::Point3(roundf(_icon_size / 2.0f), roundf(_icon_size / 2.0f), 0.0f);
+  arg.render_center = nux::Point3(roundf(texture->GetWidth() / 2.0f), roundf(texture->GetHeight() / 2.0f), 0.0f);
   arg.logical_center = arg.render_center;
   arg.x_rotation = 0.0f;
   arg.running_arrow = false;
@@ -2515,7 +2505,7 @@
   std::list<RenderArg> drag_args;
   drag_args.push_front(arg);
 
-  SetOffscreenRenderTarget(texture);
+  graphics::PushOffscreenRenderTarget(texture);
 
   unsigned int alpha = 0, src = 0, dest = 0;
   GfxContext.GetRenderStates().GetBlend(alpha, src, dest);
@@ -2529,9 +2519,11 @@
 
   GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
 
-  icon_renderer->PreprocessIcons(drag_args, nux::Geometry(0, 0, _icon_size, _icon_size));
-  icon_renderer->RenderIcon(nux::GetWindowThread()->GetGraphicsEngine(), arg, nux::Geometry(0, 0, _icon_size, _icon_size), nux::Geometry(0, 0, _icon_size, _icon_size));
-  RestoreSystemRenderTarget();
+  nux::Geometry geo(0, 0, texture->GetWidth(), texture->GetWidth());
+
+  icon_renderer->PreprocessIcons(drag_args, geo);
+  icon_renderer->RenderIcon(GfxContext, arg, geo, geo);
+  unity::graphics::PopOffscreenRenderTarget();
 }
 
 nux::GestureDeliveryRequest Launcher::GestureEvent(const nux::GestureEvent &event)
@@ -2552,30 +2544,6 @@
   return nux::GestureDeliveryRequest::NONE;
 }
 
-void
-Launcher::SetOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
-{
-  int width = texture->GetWidth();
-  int height = texture->GetHeight();
-
-  auto graphics_display = nux::GetGraphicsDisplay();
-  auto gpu_device = graphics_display->GetGpuDevice();
-  gpu_device->FormatFrameBufferObject(width, height, nux::BITFMT_R8G8B8A8);
-  gpu_device->SetColorRenderTargetSurface(0, texture->GetSurfaceLevel(0));
-  gpu_device->ActivateFrameBuffer();
-
-  auto graphics_engine = graphics_display->GetGraphicsEngine();
-  graphics_engine->SetContext(0, 0, width, height);
-  graphics_engine->SetViewport(0, 0, width, height);
-  graphics_engine->Push2DWindow(width, height);
-  graphics_engine->EmptyClippingRegion();
-}
-
-void Launcher::RestoreSystemRenderTarget()
-{
-  nux::GetWindowCompositor().RestoreRenderingSurface();
-}
-
 bool Launcher::DndIsSpecialRequest(std::string const& uri) const
 {
   return (boost::algorithm::ends_with(uri, ".desktop") || uri.find("device://") == 0);

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-10-29 09:34:54 +0000
+++ launcher/Launcher.h	2012-11-01 08:29:20 +0000
@@ -317,9 +317,6 @@
 
   virtual long PostLayoutManagement(long LayoutResult);
 
-  void SetOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
-  void RestoreSystemRenderTarget();
-
   void OnDisplayChanged(Display* display);
   void OnDNDDataCollected(const std::list<char*>& mimes);
 

=== modified file 'launcher/LauncherDragWindow.cpp'
--- launcher/LauncherDragWindow.cpp	2012-10-11 01:44:15 +0000
+++ launcher/LauncherDragWindow.cpp	2012-11-01 08:29:20 +0000
@@ -35,17 +35,19 @@
 {
   const float QUICK_ANIMATION_SPEED = 0.3f;
   const float SLOW_ANIMATION_SPEED  = 0.05f;
+
+  const int ANIMATION_THRESHOLD = 5;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(LauncherDragWindow);
 
-LauncherDragWindow::LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> icon)
+LauncherDragWindow::LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
   : nux::BaseWindow("")
   , animation_speed_(QUICK_ANIMATION_SPEED)
-  , _cancelled(false)
-  , _icon(icon)
+  , cancelled_(false)
+  , texture_(texture)
 {
-  SetBaseSize(_icon->GetWidth(), _icon->GetHeight());
+  SetBaseSize(texture_->GetWidth(), texture_->GetHeight());
 
   key_down.connect([this] (unsigned long, unsigned long keysym, unsigned long, const char*, unsigned short) {
     if (keysym == NUX_VK_ESCAPE)
@@ -72,18 +74,18 @@
 
 bool LauncherDragWindow::Cancelled() const
 {
-  return _cancelled;
+  return cancelled_;
 }
 
 void LauncherDragWindow::CancelDrag()
 {
-  _cancelled = true;
+  cancelled_ = true;
   drag_cancel_request.emit();
 }
 
 void LauncherDragWindow::SetAnimationTarget(int x, int y)
 {
-  _animation_target = nux::Point2(x, y);
+  animation_target_ = nux::Point2(x, y);
 }
 
 void LauncherDragWindow::StartQuickAnimation()
@@ -113,16 +115,16 @@
 
   int half_size = geo.width / 2;
 
-  int target_x = static_cast<int>(_animation_target.x) - half_size;
-  int target_y = static_cast<int>(_animation_target.y) - half_size;
+  int target_x = static_cast<int>(animation_target_.x) - half_size;
+  int target_y = static_cast<int>(animation_target_.y) - half_size;
 
   int x_delta = static_cast<int>(static_cast<float>(target_x - geo.x) * animation_speed_);
-  if (std::abs(x_delta) < 5)
-    x_delta = (x_delta >= 0) ? std::min(5, target_x - geo.x) : std::max(-5, target_x - geo.x);
+  if (std::abs(x_delta) < ANIMATION_THRESHOLD)
+    x_delta = (x_delta >= 0) ? std::min(ANIMATION_THRESHOLD, target_x - geo.x) : std::max(-ANIMATION_THRESHOLD, target_x - geo.x);
 
   int y_delta = static_cast<int>(static_cast<float>(target_y - geo.y) * animation_speed_);
-  if (std::abs(y_delta) < 5)
-    y_delta = (y_delta >= 0) ? std::min(5, target_y - geo.y) : std::max(-5, target_y - geo.y);
+  if (std::abs(y_delta) < ANIMATION_THRESHOLD)
+    y_delta = (y_delta >= 0) ? std::min(ANIMATION_THRESHOLD, target_y - geo.y) : std::max(-ANIMATION_THRESHOLD, target_y - geo.y);
 
   SetBaseXY(geo.x + x_delta, geo.y + y_delta);
 
@@ -151,11 +153,11 @@
   nux::TexCoordXForm texxform;
   texxform.FlipVCoord(true);
 
-  GfxContext.QRP_1Tex(0,
-                      0,
-                      _icon->GetWidth(),
-                      _icon->GetHeight(),
-                      _icon,
+  GfxContext.QRP_1Tex(geo.x,
+                      geo.y,
+                      texture_->GetWidth(),
+                      texture_->GetHeight(),
+                      texture_,
                       texxform,
                       nux::color::White);
 

=== modified file 'launcher/LauncherDragWindow.h'
--- launcher/LauncherDragWindow.h	2012-09-13 00:48:06 +0000
+++ launcher/LauncherDragWindow.h	2012-11-01 08:29:20 +0000
@@ -36,7 +36,7 @@
 {
   NUX_DECLARE_OBJECT_TYPE(LauncherDragWindow, nux::BaseWindow);
 public:
-  LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> icon);
+  LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
   ~LauncherDragWindow();
 
   void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
@@ -62,9 +62,9 @@
   void CancelDrag();
   
   float animation_speed_;
-  bool _cancelled;
-  nux::ObjectPtr<nux::IOpenGLBaseTexture> _icon;
-  nux::Point2 _animation_target;
+  bool cancelled_;
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> texture_;
+  nux::Point2 animation_target_;
   glib::Source::UniquePtr animation_timer_;
 };
 

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2012-10-17 11:08:05 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2012-11-01 08:29:20 +0000
@@ -68,8 +68,8 @@
   launcher_ = launcher;
 
   icon_texture_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(
-    launcher->GetIconSize(),
-    launcher->GetIconSize(),
+    launcher->GetWidth(),
+    launcher->GetWidth(),
     1,
     nux::BITFMT_R8G8B8A8);
 

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2012-10-18 10:44:07 +0000
+++ unity-shared/CMakeLists.txt	2012-11-01 08:29:20 +0000
@@ -34,6 +34,7 @@
      DashStyle.cpp
      DefaultThumbnailProvider.cpp
      FontSettings.cpp
+     GraphicsUtils.cpp
      IMTextEntry.cpp
      IconLoader.cpp
      IconRenderer.cpp

=== added file 'unity-shared/GraphicsUtils.cpp'
--- unity-shared/GraphicsUtils.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/GraphicsUtils.cpp	2012-11-01 08:29:20 +0000
@@ -0,0 +1,71 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Nick Dedekind <[e-mail]>
+ */
+
+#include "GraphicsUtils.h"
+#include <NuxGraphics/GLTextureResourceManager.h>
+
+namespace unity
+{
+namespace graphics
+{
+
+std::stack<nux::ObjectPtr<nux::IOpenGLBaseTexture>> rendering_stack;
+
+void PushOffscreenRenderTarget_(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
+{  
+  int width = texture->GetWidth();
+  int height = texture->GetHeight();
+
+  auto graphics_display = nux::GetGraphicsDisplay();
+  auto gpu_device = graphics_display->GetGpuDevice();
+  gpu_device->FormatFrameBufferObject(width, height, nux::BITFMT_R8G8B8A8);
+  gpu_device->SetColorRenderTargetSurface(0, texture->GetSurfaceLevel(0));
+  gpu_device->ActivateFrameBuffer();
+
+  auto graphics_engine = graphics_display->GetGraphicsEngine();
+  graphics_engine->SetContext(0, 0, width, height);
+  graphics_engine->SetViewport(0, 0, width, height);
+  graphics_engine->Push2DWindow(width, height);
+  graphics_engine->EmptyClippingRegion();
+}
+
+void PushOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
+{
+  PushOffscreenRenderTarget_(texture);
+  rendering_stack.push(texture);
+}
+
+void PopOffscreenRenderTarget()
+{
+  g_assert(rendering_stack.size() > 0);
+
+  rendering_stack.pop();
+  if (rendering_stack.size() > 0)
+  {
+    nux::ObjectPtr<nux::IOpenGLBaseTexture>& texture = rendering_stack.top();
+    PushOffscreenRenderTarget_(texture);
+  }
+  else
+  {
+    nux::GetWindowCompositor().RestoreRenderingSurface();
+  }
+}
+
+}
+}
\ No newline at end of file

=== added file 'unity-shared/GraphicsUtils.h'
--- unity-shared/GraphicsUtils.h	1970-01-01 00:00:00 +0000
+++ unity-shared/GraphicsUtils.h	2012-11-01 08:29:20 +0000
@@ -0,0 +1,36 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef UNITY_GRAPHICS_ADAPTER
+#define UNITY_GRAPHICS_ADAPTER
+
+#include <Nux/Nux.h>
+
+namespace unity
+{
+namespace graphics
+{
+
+void PushOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
+void PopOffscreenRenderTarget();
+
+}
+}
+
+#endif // UNITY_GRAPHICS_ADAPTER
\ No newline at end of file

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2012-10-17 22:13:25 +0000
+++ unity-shared/IconRenderer.cpp	2012-11-01 08:29:20 +0000
@@ -26,6 +26,7 @@
 #include <NuxGraphics/GLTextureResourceManager.h>
 
 #include <NuxGraphics/CairoGraphics.h>
+#include "GraphicsUtils.h"
 
 #include <gtk/gtk.h>
 
@@ -1010,7 +1011,7 @@
   int progress_y = fill_y + (fill_height - progress_height) / 2;
   int half_size = (right_edge - left_edge) / 2;
 
-  SetOffscreenRenderTarget(texture);
+  unity::graphics::PushOffscreenRenderTarget(texture);
 
   // FIXME
   glClear(GL_COLOR_BUFFER_BIT);
@@ -1041,7 +1042,7 @@
 
   GfxContext.PopClippingRectangle();
 
-  RestoreSystemRenderTarget();
+  unity::graphics::PopOffscreenRenderTarget();
 }
 
 void IconRenderer::DestroyTextures()
@@ -1134,29 +1135,6 @@
   PerspectiveMatrix.Perspective(Fovy, AspectRatio, NearClipPlane, FarClipPlane);
 }
 
-void
-IconRenderer::SetOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
-{
-  int width = texture->GetWidth();
-  int height = texture->GetHeight();
-
-  nux::GetGraphicsDisplay()->GetGpuDevice()->FormatFrameBufferObject(width, height, nux::BITFMT_R8G8B8A8);
-  nux::GetGraphicsDisplay()->GetGpuDevice()->SetColorRenderTargetSurface(0, texture->GetSurfaceLevel(0));
-  nux::GetGraphicsDisplay()->GetGpuDevice()->ActivateFrameBuffer();
-
-  nux::GetGraphicsDisplay()->GetGraphicsEngine()->SetContext(0, 0, width, height);
-  nux::GetGraphicsDisplay()->GetGraphicsEngine()->SetViewport(0, 0, width, height);
-  nux::GetGraphicsDisplay()->GetGraphicsEngine()->Push2DWindow(width, height);
-  nux::GetGraphicsDisplay()->GetGraphicsEngine()->EmptyClippingRegion();
-}
-
-void
-IconRenderer::RestoreSystemRenderTarget()
-{
-  nux::GetWindowCompositor().RestoreRenderingSurface();
-}
-
-
 // The local namespace is purely for namespacing the file local variables below.
 namespace local
 {

=== modified file 'unity-shared/IconRenderer.h'
--- unity-shared/IconRenderer.h	2012-10-11 20:01:44 +0000
+++ unity-shared/IconRenderer.h	2012-11-01 08:29:20 +0000
@@ -84,10 +84,6 @@
                                          float FarClipPlane,
                                          float Fovy);
 
-  void SetOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
-
-  void RestoreSystemRenderTarget();
-
 private:
   int icon_size;
   int image_size;