Merge lp:~renatofilho/unity/unity-lp876017-fixes into lp:unity

[Renato Araujo Oliveira Filho]

UnityWindow: scale window code improved

* Fixed code style.
* Moved function "GetWindowName" from UnityWindow to WindowManager.
* Used glib::Object auto pointer instead of "c" pointer;

* Fixed code style.
* Moved function "GetWindowName" from UnityWindow to WindowManager.
* Used glib::Object auto pointer instead of "c" pointer;

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

Ok, nice... It's getting better!
Another thing that must be

23:29:10 <renato> this last point you notice about the string, I do not think this is a good solution since the string is created internally by "XGetWindowProperty" and they recommend to free the memory with XFree

Yeah, but XFree is basically free, so I'd ust glib::String for that too.

Another thing that should be fixed is the titlebar font, You're actually using a sans font, but you should instead use the system font; you can see again QuicklistMenuItem::DrawText how to get the proper font name and dpi values.

An extra nice plus would be to cut the long titles fading them out, there's some code that already does it in PanelMenuView::DrawTitle, give that a test. ;)

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

> Another thing that should be fixed is the titlebar font, You're actually using
> a sans font, but you should instead use the system font; you can see again
> QuicklistMenuItem::DrawText how to get the proper font name and dpi values.

Err... I didn't remember I wrote Style::Instance().GetFontDescription(PanelItem::TITLE), you can safely use this. See the panelmenuview code for this too ;)

[Michal Hruby (mhr3)]

> 23:29:10 <renato> this last point you notice about the string, I do not think
> this is a good solution since the string is created internally by
> "XGetWindowProperty" and they recommend to free the memory with XFree
>
> Yeah, but XFree is basically free, so I'd ust glib::String for that too.
>

Mixing memory allocation functions from multiple libraries isn't a good idea... Yes, right now both XFree and g_free might be just aliases for free(), but that doesn't mean that's always the case. Please keep the XFree.

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

Mh, I see that the fade is using a linear gradient here, I think you should change it so that it only cuts the exceeding pixels with a small fade effect (as the top bar does).

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

Ah, another thing... Is it just me or I see the top bar starting one px before the thumbnail x?

http://i.imgur.com/D8nI1.png

[Michal Hruby (mhr3)]

> Ah, another thing... Is it just me or I see the top bar starting one px before
> the thumbnail x?
>
> http://i.imgur.com/D8nI1.png

Seeing that too, not all the time though, perhaps a float conversion issue?

[Renato Araujo Oliveira Filho (renatofilho)]

> Mh, I see that the fade is using a linear gradient here, I think you should
> change it so that it only cuts the exceeding pixels with a small fade effect
> (as the top bar does).

I'm using the same code used as "PanelMenuView::DrawTitle" which other code are you talking about?

[Renato Araujo Oliveira Filho (renatofilho)]

> > Mh, I see that the fade is using a linear gradient here, I think you should
> > change it so that it only cuts the exceeding pixels with a small fade effect
> > (as the top bar does).
>
>
> I'm using the same code used as "PanelMenuView::DrawTitle" which other code
> are you talking about?

Ok I found the problem, fixed on rev. 2658

[Renato Araujo Oliveira Filho (renatofilho)]

Hi guys I have fixed the problems, but I found a problem related with maximized windows which is not exactly related with this bug, but produce a bad window drawing. Take a look on this image: http://i.imgur.com/6COGR.jpg

How I can fix it?

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

> Hi guys I have fixed the problems, but I found a problem related with
> maximized windows which is not exactly related with this bug, but produce a
> bad window drawing. Take a look on this image: http://i.imgur.com/6COGR.jpg
>
> How I can fix it?

Mhm, I think you need make scale to produce smaller windows that consider the height of your decoration.
See if you can set that at scale level and then make unity to define its padding.

[Loris Zinsou (nepenthes)]

I'm still running the Unity Staging PPA version of Unity, any idea why the maximized window decoration cannot be clicked to raise the window ? Un-maximised windows are not affected by this issue.

[Renato Araujo Oliveira Filho (renatofilho)]

> I'm still running the Unity Staging PPA version of Unity, any idea why the
> maximized window decoration cannot be clicked to raise the window ? Un-
> maximised windows are not affected by this issue.

yes I have fixed this on rev: 2660, this happen because the maximized window does not have decorations.

[Loris Zinsou (nepenthes)]

That's fine then !

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

Looks good, further improvements coming into lp:~3v1n0/unity/spread-title-improved

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1205/console reported an error when processing this lp:~renatofilho/unity/unity-lp876017-fixes branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1210/console reported an error when processing this lp:~renatofilho/unity/unity-lp876017-fixes branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1212/console reported an error when processing this lp:~renatofilho/unity/unity-lp876017-fixes branch.
Not merging it.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-31 13:21:02 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-04 17:21:20 +0000
@@ -110,6 +110,8 @@
 class WindowCairoContext
 {
   public:
+    typedef std::shared_ptr<WindowCairoContext> Ptr;
+
     Pixmap pixmap_;
     cairo_surface_t* surface_;
     GLTexture::List texture_;
@@ -421,7 +423,10 @@
   }
 
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &UnityScreen::OnPanelStyleChanged));
-  
+
+  WindowManager::Default()->initiate_spread.connect(sigc::mem_fun(this, &UnityScreen::OnInitiateSpreed));
+  WindowManager::Default()->terminate_spread.connect(sigc::mem_fun(this, &UnityScreen::OnTerminateSpreed));
+
   minimize_speed_controller->DurationChanged.connect(
       sigc::mem_fun(this, &UnityScreen::OnMinimizeDurationChanged)
   );
@@ -438,6 +443,25 @@
   reset_glib_logging();
 }
 
+void UnityScreen::OnInitiateSpreed()
+{
+  for (CompWindow *w : screen->windows())
+  {
+    UnityWindow *uw = UnityWindow::get(w);
+    uw->InitiateSpreed();
+  }
+}
+
+void UnityScreen::OnTerminateSpreed()
+{
+  for (CompWindow *w : screen->windows())
+  {
+    UnityWindow *uw = UnityWindow::get(w);
+    uw->TerminateSpreed();
+  }
+}
+
+
 void UnityScreen::initAltTabNextWindow()
 {
   KeyboardUtil key_util(screen->dpy());
@@ -1257,7 +1281,8 @@
   }
 }
 
-CompRect UnityWindow::closeButtonArea ()
+CompRect
+UnityWindow::CloseButtonArea()
 {
     return close_button_area_;
 }
@@ -1633,14 +1658,14 @@
           event->xbutton.button == Button1 &&
           highlighted_window_ != 0)
       {
-        CompWindow *w = screen->findWindow (highlighted_window_);
+        CompWindow *w = screen->findWindow(highlighted_window_);
         if (w)
         {
-          UnityWindow *uw = UnityWindow::get (w);
-          CompPoint pointer (pointerX, pointerY);
-          if (uw->closeButtonArea ().contains (pointer))
+          UnityWindow *uw = UnityWindow::get(w);
+          CompPoint pointer(pointerX, pointerY);
+          if (uw->CloseButtonArea().contains(pointer))
           {
-            w->close (0);
+            w->close(0);
             skip_other_plugins = true;
           }
         }
@@ -3517,18 +3542,19 @@
   }
 }
 
-void UnityWindow::DrawTexture (GLTexture* icon,
-                               const GLWindowPaintAttrib& attrib,
-                               const GLMatrix& transform,
-                               unsigned int mask,
-                               float x, float y,
-                               int &maxWidth, int &maxHeight)
+void
+UnityWindow::DrawTexture(GLTexture* icon,
+                         const GLWindowPaintAttrib& attrib,
+                         const GLMatrix& transform,
+                         unsigned int mask,
+                         float x, float y,
+                         int &maxWidth, int &maxHeight)
 {
   if (icon)
   {
     int width, height;
-    width  = icon->width ();
-    height = icon->height ();
+    width  = icon->width();
+    height = icon->height();
 
     if (height > maxHeight)
       maxHeight = height;
@@ -3536,271 +3562,343 @@
     if (width > maxWidth)
       maxWidth = width;
 
-    CompRegion  iconReg (0, 0, width, height);
-    GLTexture::MatrixList ml (1);
+    CompRegion  iconReg(0, 0, width, height);
+    GLTexture::MatrixList ml(1);
 
-    ml[0] = icon->matrix ();
-    gWindow->vertexBuffer ()->begin ();
+    ml[0] = icon->matrix();
+    gWindow->vertexBuffer()->begin();
     if (width && height)
-      gWindow->glAddGeometry (ml, iconReg, iconReg);
-
-    if (gWindow->vertexBuffer ()->end ())
-    {
-      GLMatrix wTransform (transform);
-
-      wTransform.translate (x, y, 0.0f);
-
-      gWindow->glDrawTexture (icon, wTransform, attrib, mask);
-    }
-  }
-}
-
-WindowCairoContext* UnityWindow::CreateCairoContext (float width, float height)
-{
-    XRenderPictFormat *format;
-    Screen *xScreen;
-    WindowCairoContext *context = new WindowCairoContext();
-
-    xScreen = ScreenOfDisplay (screen->dpy (), screen->screenNum ());
-
-    format = XRenderFindStandardFormat (screen->dpy (), PictStandardARGB32);
-    context->pixmap_ = XCreatePixmap (screen->dpy (),
-                                      screen->root (),
-                                      width, height, 32);
-
-    context->texture_ = GLTexture::bindPixmapToTexture (context->pixmap_,
-                                                        width, height,
-                                                        32);
-    if (context->texture_.empty ())
-    {
-      delete context;
-      return 0;
-    }
-
-    context->surface_ = cairo_xlib_surface_create_with_xrender_format (screen->dpy (),
-                                                                       context->pixmap_,
-                                                                       xScreen,
-                                                                       format,
-                                                                       width,
-                                                                       height);
-    context->cr_ = cairo_create (context->surface_);
-
-    // clear
-    cairo_save (context->cr_);
-    cairo_set_operator (context->cr_, CAIRO_OPERATOR_CLEAR);
-    cairo_paint (context->cr_);
-    cairo_restore (context->cr_);
-
-    return context;
-}
-
-void UnityWindow::RenderText (WindowCairoContext *context,
-                              float x, float y,
-                              float maxWidth, float maxHeight)
-{
-  PangoFontDescription* font = pango_font_description_new ();
-  pango_font_description_set_family (font, "sans");
-  pango_font_description_set_absolute_size (font, 12 * PANGO_SCALE);
-  pango_font_description_set_style (font, PANGO_STYLE_NORMAL);
-  pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD);
-
-  PangoLayout* layout = pango_cairo_create_layout (context->cr_);
-  pango_layout_set_font_description (layout, font);
-  pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
-  pango_layout_set_height (layout, maxHeight);
-
-  pango_layout_set_auto_dir (layout, false);
-  pango_layout_set_text (layout,
-                         GetWindowName (window->id ()).c_str (),
-                         -1);
+      gWindow->glAddGeometry(ml, iconReg, iconReg);
+
+    if (gWindow->vertexBuffer()->end())
+    {
+      GLMatrix wTransform(transform);
+
+      wTransform.translate(x, y, 0.0f);
+
+      gWindow->glDrawTexture(icon, wTransform, attrib, mask);
+    }
+  }
+}
+
+std::shared_ptr<WindowCairoContext>
+UnityWindow::CreateCairoContext(float width, float height)
+{
+  XRenderPictFormat *format;
+  Screen *xScreen;
+  auto cContext = std::make_shared<WindowCairoContext>();
+
+  xScreen = ScreenOfDisplay(screen->dpy(), screen->screenNum());
+
+  format = XRenderFindStandardFormat(screen->dpy(), PictStandardARGB32);
+  cContext->pixmap_ = XCreatePixmap(screen->dpy(),
+                                   screen->root(),
+                                   width, height, 32);
+
+  cContext->texture_ = GLTexture::bindPixmapToTexture(cContext->pixmap_,
+                                                      width, height,
+                                                      32);
+  if (cContext->texture_.empty())
+  {
+    return 0;
+  }
+
+  cContext->surface_ = cairo_xlib_surface_create_with_xrender_format(screen->dpy(),
+                                                                     cContext->pixmap_,
+                                                                     xScreen,
+                                                                     format,
+                                                                     width,
+                                                                     height);
+  cContext->cr_ = cairo_create(cContext->surface_);
+
+  // clear
+  cairo_save(cContext->cr_);
+  cairo_set_operator(cContext->cr_, CAIRO_OPERATOR_CLEAR);
+  cairo_paint(cContext->cr_);
+  cairo_restore(cContext->cr_);
+
+  return cContext;
+}
+
+void
+UnityWindow::RenderText(WindowCairoContext *context,
+                        float x, float y,
+                        float maxWidth, float maxHeight)
+{
+  panel::Style& style = panel::Style::Instance();
+  std::string fontDescription(style.GetFontDescription(panel::PanelItem::TITLE));
+
+  glib::Object<PangoLayout> layout(pango_cairo_create_layout(context->cr_));
+  std::shared_ptr<PangoFontDescription> font(pango_font_description_from_string(fontDescription.c_str()),
+                                             pango_font_description_free);
+
+  pango_layout_set_font_description(layout, font.get());
+
+  GdkScreen* gdkScreen = gdk_screen_get_default();
+  PangoContext* pCxt = pango_layout_get_context(layout);
+  int dpi = style.GetTextDPI();
+
+  pango_cairo_context_set_font_options(pCxt, gdk_screen_get_font_options(gdkScreen));
+  pango_cairo_context_set_resolution(pCxt, dpi / static_cast<float>(PANGO_SCALE));
+  pango_layout_context_changed(layout);
+
+  pango_layout_set_height(layout, maxHeight);
+  pango_layout_set_width(layout, -1); //avoid wrap lines
+  pango_layout_set_auto_dir(layout, false);
+  pango_layout_set_text(layout,
+                        WindowManager::Default()->GetWindowName(window->id()).c_str(),
+                        -1);
 
   /* update the size of the pango layout */
-  pango_layout_set_width (layout, maxWidth * PANGO_SCALE);
-  pango_cairo_update_layout (context->cr_, layout);
-
-  cairo_set_operator (context->cr_, CAIRO_OPERATOR_OVER);
-
-  cairo_set_source_rgba (context->cr_,
-                         1.0,
-                         1.0,
-                         1.0,
-                         1.0);
+  pango_cairo_update_layout(context->cr_, layout);
+  cairo_set_operator(context->cr_, CAIRO_OPERATOR_OVER);
+  cairo_set_source_rgba(context->cr_,
+                        1.0,
+                        1.0,
+                        1.0,
+                        1.0);
 
   // alignment
-  int lWidth, lHeight;
-  pango_layout_get_pixel_size (layout, &lWidth, &lHeight);
-
-  y = ((maxHeight - lHeight) / 2.0) + y;
-  cairo_translate (context->cr_, x, y);
-  pango_cairo_show_layout (context->cr_, layout);
+  PangoRectangle lRect;
+  int textWidth, textHeight;
+
+  pango_layout_get_extents(layout, NULL, &lRect);
+  textWidth = lRect.width / PANGO_SCALE;
+  textHeight = lRect.height / PANGO_SCALE;
+
+  y = ((maxHeight - textHeight) / 2.0) + y;
+  cairo_translate(context->cr_, x, y);
+
+  if (textWidth > maxWidth)
+  {
+    // apply a fade effect in the right corner
+    const int outPixels = textWidth - maxWidth;
+    const int fadingPixels = 35;
+    const int fadingWidth = outPixels < fadingPixels ? outPixels : fadingPixels;
+
+    cairo_push_group(context->cr_);
+    pango_cairo_show_layout(context->cr_, layout);
+    cairo_pop_group_to_source(context->cr_);
+
+    std::shared_ptr<cairo_pattern_t> linpat(cairo_pattern_create_linear(maxWidth - fadingWidth,
+                                                                        y, maxWidth, y),
+                                            cairo_pattern_destroy);
+    cairo_pattern_add_color_stop_rgba(linpat.get(), 0, 0, 0, 0, 1);
+    cairo_pattern_add_color_stop_rgba(linpat.get(), 1, 0, 0, 0, 0);
+    cairo_mask(context->cr_, linpat.get());
+  }
+  else
+  {
+    pango_cairo_show_layout(context->cr_, layout);
+  }
 }
 
-void UnityWindow::DrawWindowTitle (const GLWindowPaintAttrib& attrib,
-                                   const GLMatrix& transform,
-                                   unsigned int mask,
-                                   float x, float y, float x2, float y2)
+void
+UnityWindow::DrawWindowDecoration(const GLWindowPaintAttrib& attrib,
+                                  const GLMatrix& transform,
+                                  unsigned int mask,
+                                  bool highlighted,
+                                  float x, float y, float x2, float y2)
 {
   const float width = x2 - x;
+  const float height = y2 - y;
 
   // Paint a fake window decoration
-  WindowCairoContext *context = CreateCairoContext (width, SCALE_WINDOW_TITLE_SIZE);
+  WindowCairoContext::Ptr context(CreateCairoContext(width, height));
 
-  cairo_save (context->cr_);
-  cairo_push_group (context->cr_);
+  cairo_save(context->cr_);
+  cairo_push_group(context->cr_);
 
   // Round window decoration top border
-  const double height = SCALE_WINDOW_TITLE_SIZE;
   const double aspect = 1.0;
   const double corner_radius = height / 10.0;
   const double radius = corner_radius / aspect;
   const double degrees = M_PI / 180.0;
 
-  cairo_new_sub_path (context->cr_);
-
-  cairo_arc (context->cr_, radius, radius, radius, 180 * degrees, 270 * degrees);
-  cairo_arc (context->cr_, width - radius, radius, radius, -90 * degrees, 0 * degrees);
-  cairo_line_to (context->cr_, width, height);
-  cairo_line_to (context->cr_, 0, height);
-
-  cairo_close_path (context->cr_);
-  cairo_clip (context->cr_);
+  cairo_new_sub_path(context->cr_);
+
+  cairo_arc(context->cr_, radius, radius, radius, 180 * degrees, 270 * degrees);
+  cairo_arc(context->cr_, width - radius, radius, radius, -90 * degrees, 0 * degrees);
+  cairo_line_to(context->cr_, width, height);
+  cairo_line_to(context->cr_, 0, height);
+
+  cairo_close_path(context->cr_);
+  cairo_clip(context->cr_);
 
   // Draw window decoration abased on gtk style
-  gtk_render_background (window_header_style_, context->cr_, 0, 0, width, SCALE_WINDOW_TITLE_SIZE);
-  gtk_render_frame (window_header_style_, context->cr_, 0, 0, width, SCALE_WINDOW_TITLE_SIZE);
-
-  cairo_pop_group_to_source (context->cr_);
-
-  cairo_paint_with_alpha (context->cr_, 1.0);
-  cairo_restore (context->cr_);
-
-  // Draw windows title
-  RenderText (context,
-              CLOSE_ICON_SPACE * 2 + CLOSE_ICON_SIZE,
-              0.0,
-              width, SCALE_WINDOW_TITLE_SIZE);
+  gtk_render_background(window_header_style_, context->cr_, 0, 0, width, height);
+  gtk_render_frame(window_header_style_, context->cr_, 0, 0, width, height);
+
+  cairo_pop_group_to_source(context->cr_);
+
+  cairo_paint_with_alpha(context->cr_, 1.0);
+  cairo_restore(context->cr_);
+
+  if (highlighted)
+  {
+    // Draw windows title
+    const float xText = CLOSE_ICON_SPACE * 2 + CLOSE_ICON_SIZE;
+    RenderText(context.get(),
+               xText, 0.0,
+               width - xText, height);
+  }
 
   mask |= PAINT_WINDOW_BLEND_MASK;
   int maxWidth, maxHeight;
   foreach(GLTexture *icon, context->texture_)
   {
-    DrawTexture (icon, attrib, transform, mask,
-                 x, y,
-                 maxWidth , maxHeight);
+    DrawTexture(icon, attrib, transform, mask,
+                x, y,
+                maxWidth , maxHeight);
   }
-
-  delete context;
 }
 
-void UnityWindow::scalePaintDecoration (const GLWindowPaintAttrib& attrib,
-                                        const GLMatrix& transform,
-                                        const CompRegion& region,
-                                        unsigned int mask)
+void
+UnityWindow::PrepareHeaderStyle()
 {
-  ScaleWindow *sWindow = ScaleWindow::get (window);
-  if (!sWindow)
-    return;
-
-  sWindow->scalePaintDecoration (attrib, transform, region, mask);
-
-  if (!sWindow->hasSlot()) // animation not finished
-    return;
-
   if (!window_header_style_)
   {
-    GtkWidgetPath* widget_path = gtk_widget_path_new ();
-    gint pos = gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
-    gtk_widget_path_iter_set_name (widget_path, pos, "UnityPanelWidget");
+    GtkWidgetPath* widget_path = gtk_widget_path_new();
+    gint pos = gtk_widget_path_append_type(widget_path, GTK_TYPE_WINDOW);
+    gtk_widget_path_iter_set_name(widget_path, pos, "UnityPanelWidget");
 
-    window_header_style_  = gtk_style_context_new ();
-    gtk_style_context_set_path (window_header_style_, widget_path);
-    gtk_style_context_add_class (window_header_style_, "gnome-panel-menu-bar");
-    gtk_style_context_add_class (window_header_style_, "unity-panel");
+    window_header_style_  = glib::Object<GtkStyleContext>(gtk_style_context_new());
+    gtk_style_context_set_path(window_header_style_, widget_path);
+    gtk_style_context_add_class(window_header_style_, "gnome-panel-menu-bar");
+    gtk_style_context_add_class(window_header_style_, "unity-panel");
 
     // get close button
     panel::Style& style = panel::Style::Instance();
 
-    std::vector<std::string> files = style.GetWindowButtonFileNames (panel::WindowButtonType::CLOSE,
-                                                                     panel::WindowState::NORMAL);
+    std::vector<std::string> files = style.GetWindowButtonFileNames(panel::WindowButtonType::CLOSE,
+                                                                    panel::WindowState::NORMAL);
 
-    CompString pName ("unityshell");
+    CompString pName("unityshell");
     foreach (std::string file, files)
     {
-      CompString fileName (file.c_str ());
-      CompSize size (CLOSE_ICON_SIZE, CLOSE_ICON_SIZE);
-      close_icon_ = GLTexture::readImageToTexture (fileName,
-                                                   pName,
-                                                   size);
-      if (close_icon_.size () != 0)
+      CompString fileName(file.c_str ());
+      CompSize size(CLOSE_ICON_SIZE, CLOSE_ICON_SIZE);
+      close_icon_ = GLTexture::readImageToTexture(fileName,
+                                                  pName,
+                                                  size);
+      if (close_icon_.size() != 0)
         break;
     }
 
-    if (close_icon_.size () == 0)
+    if (close_icon_.size() == 0)
     {
-      CompString fileName (PKGDATADIR"/close_dash.png");
-      CompSize size (CLOSE_ICON_SIZE, CLOSE_ICON_SIZE);
-      close_icon_ = GLTexture::readImageToTexture (fileName,
-                                                   pName,
-                                                   size);
+      CompString fileName(PKGDATADIR"/close_dash.png");
+      CompSize size(CLOSE_ICON_SIZE, CLOSE_ICON_SIZE);
+      close_icon_ = GLTexture::readImageToTexture(fileName,
+                                                  pName,
+                                                  size);
     }
   }
-
-  // Make the windows header opaque to override the original
-  GLWindowPaintAttrib sAttrib (attrib);
+}
+
+void
+UnityWindow::scalePaintDecoration(const GLWindowPaintAttrib& attrib,
+                                  const GLMatrix& transform,
+                                  const CompRegion& region,
+                                  unsigned int mask)
+{
+  ScaleWindow *sWindow = ScaleWindow::get(window);
+  if (!sWindow)
+    return;
+
+  sWindow->scalePaintDecoration(attrib, transform, region, mask);
+
+  if (!sWindow->hasSlot()) // animation not finished
+    return;
+
+  UnityScreen* us = UnityScreen::get(screen);
+  const guint32 xid = window->id();
+  const bool highlighted = (us->highlighted_window_ == xid);
+  GLWindowPaintAttrib sAttrib(attrib);
   sAttrib.opacity = OPAQUE;
 
-  ScalePosition pos = sWindow->getCurrentPosition ();
+  PrepareHeaderStyle();
+
+  ScalePosition pos = sWindow->getCurrentPosition();
   int maxHeight, maxWidth;
-  // Use "2" as margin to make sure to cover all originial decoration
-  const float width = (window->width () + 4) * pos.scale;
-  const float x = pos.x () + window->x () - (2 * pos.scale);
-  const float y = pos.y () + window->y () - SCALE_WINDOW_TITLE_SIZE;
-  const float iconX = x + CLOSE_ICON_SPACE;
-  const float iconY = y + ((SCALE_WINDOW_TITLE_SIZE - CLOSE_ICON_SIZE)  / 2.0);
-
-  maxHeight = maxWidth = 0;
-
-  DrawWindowTitle (sAttrib,
-                   transform,
-                   mask,
-                   x, y,
-                   x + width, y + SCALE_WINDOW_TITLE_SIZE);
-
-  mask |= PAINT_WINDOW_BLEND_MASK;
-  foreach(GLTexture *icon, close_icon_)
-  {
-    DrawTexture (icon, sAttrib, transform, mask,
-                 iconX, iconY,
-                 maxWidth , maxHeight);
-  }
-
-  close_button_area_ = CompRect (iconX, iconY, maxWidth, maxHeight);
+  // Use "1" as margin to make sure to cover all originial decoration
+  const float width = (window->width() * pos.scale) + 2;
+  const float x = pos.x() + window->x() - 1;
+  float y = pos.y() + window->y();
+  float decorationHeight = SCALE_WINDOW_TITLE_SIZE;
+
+  // If window is decorated draw the decoration
+  // otherwise draw a small bar over the window
+  if (!highlighted)
+    decorationHeight = SCALE_WINDOW_TITLE_SIZE * 0.30;
+
+  DrawWindowDecoration(sAttrib, transform, mask, highlighted,
+                       x, y,
+                       x + width, y + decorationHeight);
+
+  if (highlighted)
+  {
+    const float iconX = x + CLOSE_ICON_SPACE;
+    const float iconY = y + ((decorationHeight - CLOSE_ICON_SIZE)  / 2.0);
+    maxHeight = maxWidth = 0;
+    mask |= PAINT_WINDOW_BLEND_MASK;
+
+    foreach(GLTexture *icon, close_icon_)
+    {
+      DrawTexture(icon, sAttrib, transform, mask,
+                  iconX, iconY,
+                  maxWidth , maxHeight);
+    }
+
+    close_button_area_ = CompRect(iconX, iconY, maxWidth, maxHeight);
+  }
+  else
+  {
+    close_button_area_ = CompRect();
+  }
 }
 
-void UnityWindow::scaleSelectWindow ()
+void
+UnityWindow::scaleSelectWindow ()
 {
   UnityScreen* us = UnityScreen::get(screen);
 
   if (us->highlighted_window_ != window->id ())
   {
-    CompositeWindow *cWindow = CompositeWindow::get (window);
+    CompositeWindow *cWindow = CompositeWindow::get(window);
     if (cWindow)
-      cWindow->addDamage ();
+      cWindow->addDamage();
 
     cWindow = 0;
-    CompWindow *old_window = screen->findWindow (us->highlighted_window_);
+    CompWindow *old_window = screen->findWindow(us->highlighted_window_);
     if (old_window)
-      cWindow = CompositeWindow::get (old_window);
+      cWindow = CompositeWindow::get(old_window);
 
     if (cWindow)
-      cWindow->addDamage ();
+      cWindow->addDamage();
 
-    us->highlighted_window_ = window->id ();
+    us->highlighted_window_ = window->id();
   }
 
-  ScaleWindow *sWindow = ScaleWindow::get (window);
+  ScaleWindow *sWindow = ScaleWindow::get(window);
   if (sWindow)
-    sWindow->scaleSelectWindow ();
+    sWindow->scaleSelectWindow();
+}
+
+void UnityWindow::InitiateSpreed()
+{
+  WindowManager *wm = WindowManager::Default();
+  const guint32 xid = window->id();
+  has_original_decoration_ = wm->IsWindowDecorated(xid) &&
+                             !wm->IsWindowMaximized(xid);
+  if (has_original_decoration_)
+    wm->Undecorate(xid);
+}
+
+void UnityWindow::TerminateSpreed()
+{
+  if (has_original_decoration_)
+    WindowManager::Default()->Decorate(window->id());
 }
 
 UnityWindow::~UnityWindow()
@@ -3821,9 +3919,6 @@
       window->minimize ();
   }
 
-  if (window_header_style_)
-    g_object_unref (window_header_style_);
-
   ShowdesktopHandler::animating_windows.remove (static_cast <ShowdesktopHandlerWindowInterface *> (this));
 
   if (mShowdesktopHandler)
@@ -3863,85 +3958,6 @@
   return true;
 }
 
-CompString UnityWindow::GetUtf8Property (Window id,
-                                         Atom atom)
-{
-    Atom          type;
-    int           result, format;
-    unsigned long nItems, bytesAfter;
-    char          *val;
-    CompString    retval;
-    Atom          utf8StringAtom;
-
-    utf8StringAtom = XInternAtom (screen->dpy (), "UTF8_STRING", 0);
-    result = XGetWindowProperty (screen->dpy (), id, atom, 0L, 65536, False,
-                                 utf8StringAtom, &type, &format, &nItems,
-                                 &bytesAfter, (unsigned char **) &val);
-
-    if (result != Success)
-      return retval;
-
-    if (type == utf8StringAtom && format == 8 && val && nItems > 0)
-    {
-      char valueString[nItems + 1];
-      strncpy (valueString, val, nItems);
-      valueString[nItems] = 0;
-      retval = valueString;
-    }
-    if (val)
-      XFree (val);
-
-    return retval;
-}
-
-CompString UnityWindow::GetTextProperty (Window id,
-                                         Atom   atom)
-{
-  XTextProperty text;
-  CompString    retval;
-
-  text.nitems = 0;
-  if (XGetTextProperty (screen->dpy (), id, &text, atom))
-  {
-    if (text.value)
-    {
-      char valueString[text.nitems + 1];
-
-      strncpy (valueString, (char *) text.value, text.nitems);
-      valueString[text.nitems] = 0;
-
-      retval = valueString;
-
-      XFree (text.value);
-    }
-  }
-
-  return retval;
-}
-
-
-CompString UnityWindow::GetWindowName (Window id)
-{
-  CompString name;
-  Atom       visibleNameAtom;
-
-  visibleNameAtom = XInternAtom (screen->dpy (), "_NET_WM_VISIBLE_NAME", 0);
-  name = GetUtf8Property (id, visibleNameAtom);
-  if (name.empty ())
-  {
-    Atom wmNameAtom = XInternAtom (screen->dpy (), "_NET_WM_NAME", 0);
-    name = GetUtf8Property (id, wmNameAtom);
-  }
-
-
-  if (name.empty ())
-    name = GetTextProperty (id, XA_WM_NAME);
-
-  return name;
-}
-
-
-
 namespace
 {
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-08-31 13:21:02 +0000
+++ plugins/unityshell/src/unityshell.h	2012-09-04 17:21:20 +0000
@@ -249,7 +249,10 @@
   void OnPanelStyleChanged();
 
   void InitGesturesSupport();
-  
+
+  void OnInitiateSpreed();
+  void OnTerminateSpreed();
+
   nux::animation::TickSource tick_source_;
   nux::animation::AnimationController animation_controller_;
 
@@ -419,7 +422,7 @@
 
   void handleEvent (XEvent *event);
 
-  CompRect closeButtonArea ();
+  CompRect CloseButtonArea();
 
   typedef compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>
           UnityMinimizedHandler;
@@ -430,11 +433,14 @@
   //! Emited when CompWindowNotifyBeforeDestroy is received
   sigc::signal<void> being_destroyed;
 
-  void scaleSelectWindow ();
-  void scalePaintDecoration (const GLWindowPaintAttrib &,
-                             const GLMatrix &,
-                             const CompRegion &,
-                             unsigned int);
+  void scaleSelectWindow();
+  void scalePaintDecoration(const GLWindowPaintAttrib &,
+                            const GLMatrix &,
+                            const CompRegion &,
+                            unsigned int);
+
+  void InitiateSpreed();
+  void TerminateSpreed();
 
 private:
   void DoEnableFocus ();
@@ -467,32 +473,30 @@
 
   compiz::WindowInputRemoverLock::Ptr GetInputRemover ();
 
-  void DrawWindowTitle (const GLWindowPaintAttrib& attrib,
-                        const GLMatrix& transform,
-                        unsigned int mask,
-                        float x, float y, float x2, float y2);
-  void DrawTexture (GLTexture *icon,
-                    const GLWindowPaintAttrib& attrib,
-                    const GLMatrix& transform,
-                    unsigned int mask,
-                    float x, float y,
-                    int &maxWidth, int &maxHeight);
-  void RenderText (WindowCairoContext *context,
+  void DrawWindowDecoration(const GLWindowPaintAttrib& attrib,
+                            const GLMatrix& transform,
+                            unsigned int mask,
+                            bool highlighted,
+                            float x, float y, float x2, float y2);
+  void DrawTexture(GLTexture *icon,
+                   const GLWindowPaintAttrib& attrib,
+                   const GLMatrix& transform,
+                   unsigned int mask,
                    float x, float y,
-                   float maxWidth, float maxHeight);
-  WindowCairoContext* CreateCairoContext (float width, float height);
-
-  // based on compiz text plugin
-  CompString GetWindowName (Window id);
-  CompString GetUtf8Property (Window id, Atom atom);
-  CompString GetTextProperty (Window id, Atom atom);
+                   int &maxWidth, int &maxHeight);
+  void RenderText(WindowCairoContext *context,
+                  float x, float y,
+                  float maxWidth, float maxHeight);
+  void PrepareHeaderStyle();
+  std::shared_ptr<WindowCairoContext> CreateCairoContext(float width, float height);
 
   compiz::WindowInputRemoverLock::Weak input_remover_;
   glib::Source::UniquePtr focus_desktop_timeout_;
 
   GLTexture::List close_icon_;
   CompRect close_button_area_;
-  GtkStyleContext* window_header_style_;
+  glib::Object<GtkStyleContext> window_header_style_;
+  bool has_original_decoration_;
 };
 
 

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2012-08-02 21:21:12 +0000
+++ unity-shared/PluginAdapter.h	2012-09-04 17:21:20 +0000
@@ -154,6 +154,7 @@
   nux::Geometry GetWindowSavedGeometry(guint32 xid) const;
   nux::Geometry GetScreenGeometry() const;
   nux::Geometry GetWorkAreaGeometry(guint32 xid = 0) const;
+  std::string GetWindowName(guint32 xid) const;
 
   void CheckWindowIntersections(nux::Geometry const& region, bool &active, bool &any);
 
@@ -177,6 +178,9 @@
   bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window) const;
   void SetMwmWindowHints(Window xid, MotifWmHints* new_hints);
 
+  std::string GetTextProperty(guint32 xid, Atom atom) const;
+  std::string GetUtf8Property(guint32 xid, Atom atom) const;
+
   CompScreen* m_Screen;
   MultiActionList m_ExpoActionList;
   MultiActionList m_ScaleActionList;

=== modified file 'unity-shared/PluginAdapterCompiz.cpp'
--- unity-shared/PluginAdapterCompiz.cpp	2012-08-17 05:58:15 +0000
+++ unity-shared/PluginAdapterCompiz.cpp	2012-09-04 17:21:20 +0000
@@ -1335,3 +1335,70 @@
          .add("viewport_switch_running", IsViewPortSwitchStarted())
          .add("showdesktop_active", _in_show_desktop);
 }
+
+std::string
+PluginAdapter::GetWindowName(guint32 xid) const
+{
+  std::string name;
+  Atom visibleNameAtom;
+
+  visibleNameAtom = XInternAtom(m_Screen->dpy(), "_NET_WM_VISIBLE_NAME", 0);
+  name = GetUtf8Property(xid, visibleNameAtom);
+  if (name.empty())
+  {
+    Atom wmNameAtom = XInternAtom(m_Screen->dpy(), "_NET_WM_NAME", 0);
+    name = GetUtf8Property(xid, wmNameAtom);
+  }
+
+  if (name.empty())
+    name = GetTextProperty(xid, XA_WM_NAME);
+
+  return name;
+}
+
+std::string
+PluginAdapter::GetUtf8Property(guint32 xid, Atom atom) const
+{
+  Atom          type;
+  int           result, format;
+  unsigned long nItems, bytesAfter;
+  char          *val;
+  std::string   retval;
+  Atom          utf8StringAtom;
+
+  utf8StringAtom = XInternAtom(m_Screen->dpy(), "UTF8_STRING", 0);
+  result = XGetWindowProperty(m_Screen->dpy(), xid, atom, 0L, 65536, False,
+                              utf8StringAtom, &type, &format, &nItems,
+                              &bytesAfter, reinterpret_cast<unsigned char **>(&val));
+
+  if (result != Success)
+    return retval;
+
+  if (type == utf8StringAtom && format == 8 && val && nItems > 0)
+  {
+    retval = std::string(val, nItems);
+  }
+  if (val)
+    XFree(val);
+
+  return retval;
+}
+
+std::string
+PluginAdapter::GetTextProperty(guint32 id, Atom atom) const
+{
+  XTextProperty text;
+  std::string retval;
+
+  text.nitems = 0;
+  if (XGetTextProperty(m_Screen->dpy(), id, &text, atom))
+  {
+    if (text.value)
+    {
+      retval = std::string(reinterpret_cast<char*>(text.value), text.nitems);
+      XFree (text.value);
+    }
+  }
+
+  return retval;
+}

=== modified file 'unity-shared/PluginAdapterStandalone.cpp'
--- unity-shared/PluginAdapterStandalone.cpp	2012-08-02 21:21:12 +0000
+++ unity-shared/PluginAdapterStandalone.cpp	2012-09-04 17:21:20 +0000
@@ -458,3 +458,9 @@
          .add("viewport_switch_running", IsViewPortSwitchStarted())
          .add("showdesktop_active", _in_show_desktop);
 }
+
+std::string
+PluginAdapter::GetWindowName(guint32 xid) const
+{
+  return "";
+}

=== modified file 'unity-shared/WindowManager.cpp'
--- unity-shared/WindowManager.cpp	2012-08-02 21:21:12 +0000
+++ unity-shared/WindowManager.cpp	2012-09-04 17:21:20 +0000
@@ -240,6 +240,11 @@
   void AddProperties(GVariantBuilder* builder)
   {
   }
+
+  std::string GetWindowName(guint32 xid) const
+  {
+      return "unknown";
+  }
 };
 
 WindowManager*

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2012-08-02 21:21:12 +0000
+++ unity-shared/WindowManager.h	2012-09-04 17:21:20 +0000
@@ -111,6 +111,8 @@
   virtual bool saveInputFocus() = 0;
   virtual bool restoreInputFocus() = 0;
 
+  virtual std::string GetWindowName(guint32 xid) const = 0;
+
   // Signals
   sigc::signal<void, guint32> window_mapped;
   sigc::signal<void, guint32> window_unmapped;