Merge lp:~3v1n0/unity/scale-glow-corners into lp:unity

[Marco Trevisan (Treviño)]

UnityWindow: draw the glow for scaled windows a little inside their area, to glow rounded corners too

When a selected window in scale is drawn we were drawing its glow outside its shape, however this would make our rounded corners to be wrongly drawn. So now we draw a bigger glow few pixels inside the window, so that the corners will be correctly rendered.

Before this fix: https://launchpadlibrarian.net/118482869/scale-glow-corners.png
After: http://i.imgur.com/vzQ7J.png

[Andrea Azzarone (azzar1)]

LGTM. Nice fix.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1490/console reported an error when processing this lp:~3v1n0/unity/scale-glow-corners branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1492/console reported an error when processing this lp:~3v1n0/unity/scale-glow-corners branch.
Not merging it.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-10-05 01:31:19 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-05 14:34:24 +0000
@@ -112,7 +112,7 @@
 const unsigned CLOSE_SIZE = 19;
 const unsigned ITEMS_PADDING = 5;
 const unsigned RADIUS = 8;
-const unsigned GLOW = 20;
+const unsigned GLOW = 30;
 const nux::Color GLOW_COLOR(221, 72, 20);
 } // decoration namespace
 } // scale namespace
@@ -2459,6 +2459,15 @@
     }
   }
 
+  if (WindowManager::Default()->IsScaleActive() && ScaleScreen::get(screen)->getSelectedWindow() == window->id())
+  {
+    nux::Geometry scaled_geo = GetScaledGeometry();
+    int inside_glow = scale::decoration::RADIUS/4;
+    scaled_geo.Expand(-inside_glow, -inside_glow);
+    glow::Quads const& quads = computeGlowQuads(scaled_geo, glow_texture_, scale::decoration::GLOW);
+    paintGlow(matrix, attrib, region, quads, glow_texture_, scale::decoration::GLOW_COLOR, mask);
+  }
+
   return gWindow->glPaint(wAttrib, matrix, region, mask);
 }
 
@@ -2520,17 +2529,6 @@
     uScreen->paintPanelShadow(region);
   }
 
-  if (WindowManager::Default().IsScaleActive() &&
-      ScaleScreen::get(screen)->getSelectedWindow() == window->id())
-  {
-    if (!region.isEmpty())
-    {
-      double scale = ScaleWindow::get(window)->getCurrentPosition().scale;
-      glow::Quads const& quads = computeGlowQuads(glow_texture_, scale::decoration::GLOW, scale);
-      paintGlow(matrix, attrib, region, quads, glow_texture_, scale::decoration::GLOW_COLOR, mask);
-    }
-  }
-
   return ret;
 }
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-10-04 10:56:59 +0000
+++ plugins/unityshell/src/unityshell.h	2012-10-05 14:34:24 +0000
@@ -450,7 +450,7 @@
   void DrawTexture(GLTexture::List const& textures, GLWindowPaintAttrib const&,
                    GLMatrix const&, unsigned mask, int x, int y, double aspect = 1.0f);
 
-  glow::Quads computeGlowQuads(GLTexture::List const& texture, int glow_size, double window_aspect = 1.0f);
+  glow::Quads computeGlowQuads(nux::Geometry const& geo, GLTexture::List const& texture, int glow_size);
   void paintGlow(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&,
                  glow::Quads const&, GLTexture::List const&, nux::Color const&, unsigned mask);
 

=== modified file 'plugins/unityshell/src/unityshell_glow.cpp'
--- plugins/unityshell/src/unityshell_glow.cpp	2012-09-27 11:02:07 +0000
+++ plugins/unityshell/src/unityshell_glow.cpp	2012-10-05 14:34:24 +0000
@@ -130,7 +130,7 @@
  * adjusted by the matrix scale factor (matrix->xx and matrix->yy)
  *
  */
-glow::Quads UnityWindow::computeGlowQuads(GLTexture::List const& texture, int glow_size, double window_aspect)
+glow::Quads UnityWindow::computeGlowQuads(nux::Geometry const& geo, GLTexture::List const& texture, int glow_size)
 {
   glow::Quads glow_quads;
 
@@ -139,13 +139,11 @@
 
   int x1, x2, y1, y2;
   int glow_offset;
-  CompRect const& border_rect = window->borderRect();
   GLTexture::Matrix const& matrix = texture.front()->matrix();
 
   CompRect *box;
   GLTexture::Matrix *quadMatrix;
 
-  glow_size /= window_aspect;
   glow_offset = (glow_size * texture::GLOW_OFFSET / texture::GLOW_SIZE) + 1;
 
   /* Top left corner */
@@ -156,8 +154,8 @@
   /* Set the desired rect dimentions
    * for the part of the glow we are painting */
 
-  x1 = border_rect.x() - glow_size + glow_offset;
-  y1 = border_rect.y() - glow_size + glow_offset;
+  x1 = geo.x - glow_size + glow_offset;
+  y1 = geo.y - glow_size + glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position
@@ -175,10 +173,8 @@
   quadMatrix->x0 = -(x1 * quadMatrix->xx);
   quadMatrix->y0 = -(y1 * quadMatrix->yy);
 
-  x2 = std::min<int>(border_rect.x() + glow_offset,
-        border_rect.x() + (border_rect.width() / 2));
-  y2 = std::min<int>(border_rect.y() + glow_offset,
-        border_rect.y() + (border_rect.height() / 2));
+  x2 = std::min<int>(geo.x + glow_offset, geo.x + (geo.width / 2));
+  y2 = std::min<int>(geo.y + glow_offset, geo.y + (geo.height / 2));
 
   box->setGeometry(x1, y1, x2 - x1, y2 - y1);
 
@@ -190,9 +186,9 @@
   /* Set the desired rect dimentions
    * for the part of the glow we are painting */
 
-  x1 = border_rect.x() + border_rect.width() - glow_offset;
-  y1 = border_rect.y() - glow_size + glow_offset;
-  x2 = border_rect.x() + border_rect.width() + glow_size - glow_offset;
+  x1 = geo.x + geo.width - glow_offset;
+  y1 = geo.y - glow_size + glow_offset;
+  x2 = geo.x + geo.width + glow_size - glow_offset;
 
   /*
    * 2x2 Matrix here, adjust both x and y scale factors
@@ -213,10 +209,8 @@
   quadMatrix->x0 = 1.0 - (x1 * quadMatrix->xx);
   quadMatrix->y0 = -(y1 * quadMatrix->yy);
 
-  x1 = std::max<int>(border_rect.x() + border_rect.width() - glow_offset,
-        border_rect.x() + (border_rect.width() / 2));
-  y2 = std::min<int>(border_rect.y() + glow_offset,
-        border_rect.y() + (border_rect.height() / 2));
+  x1 = std::max<int>(geo.x + geo.width - glow_offset, geo.x + (geo.width / 2));
+  y2 = std::min<int>(geo.y + glow_offset, geo.y + (geo.height / 2));
 
   box->setGeometry(x1, y1, x2 - x1, y2 - y1);
 
@@ -225,10 +219,10 @@
   glow_quads[glow::QuadPos::BOTTOMLEFT].matrix = matrix;
   quadMatrix = &glow_quads[glow::QuadPos::BOTTOMLEFT].matrix;
 
-  x1 = border_rect.x() - glow_size + glow_offset;
-  y1 = border_rect.y() + border_rect.height() - glow_offset;
-  x2 = border_rect.x() + glow_offset;
-  y2 = border_rect.y() + border_rect.height() + glow_size - glow_offset;
+  x1 = geo.x - glow_size + glow_offset;
+  y1 = geo.y + geo.height - glow_offset;
+  x2 = geo.x + glow_offset;
+  y2 = geo.y + geo.height + glow_size - glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position
@@ -248,10 +242,8 @@
   quadMatrix->x0 = -(x1 * quadMatrix->xx);
   quadMatrix->y0 = 1.0f - (y1 * quadMatrix->yy);
 
-  y1 = std::max<int>(border_rect.y() + border_rect.height() - glow_offset,
-        border_rect.y() + (border_rect.height() / 2));
-  x2 = std::min<int>(border_rect.x() + glow_offset,
-        border_rect.x() + (border_rect.width() / 2));
+  y1 = std::max<int>(geo.y + geo.height - glow_offset, geo.y + (geo.height / 2));
+  x2 = std::min<int>(geo.x + glow_offset, geo.x + (geo.width / 2));
 
   box->setGeometry(x1, y1, x2 - x1, y2 - y1);
 
@@ -260,10 +252,10 @@
   glow_quads[glow::QuadPos::BOTTOMRIGHT].matrix = matrix;
   quadMatrix = &glow_quads[glow::QuadPos::BOTTOMRIGHT].matrix;
 
-  x1 = border_rect.x() + border_rect.width() - glow_offset;
-  y1 = border_rect.y() + border_rect.height() - glow_offset;
-  x2 = border_rect.x() + border_rect.width() + glow_size - glow_offset;
-  y2 = border_rect.y() + border_rect.height() + glow_size - glow_offset;
+  x1 = geo.x + geo.width - glow_offset;
+  y1 = geo.y + geo.height - glow_offset;
+  x2 = geo.x + geo.width + glow_size - glow_offset;
+  y2 = geo.y + geo.height + glow_size - glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position
@@ -281,10 +273,8 @@
   quadMatrix->x0 = 1.0 - (x1 * quadMatrix->xx);
   quadMatrix->y0 = 1.0 - (y1 * quadMatrix->yy);
 
-  x1 = std::max<int>(border_rect.x() + border_rect.width() - glow_offset,
-        border_rect.x() + (border_rect.width() / 2));
-  y1 = std::max<int>(border_rect.y() + border_rect.height() - glow_offset,
-        border_rect.y() + (border_rect.height() / 2));
+  x1 = std::max<int>(geo.x + geo.width - glow_offset, geo.x + (geo.width / 2));
+  y1 = std::max<int>(geo.y + geo.height - glow_offset, geo.y + (geo.height / 2));
 
   box->setGeometry(x1, y1, x2 - x1, y2 - y1);
 
@@ -293,10 +283,10 @@
   glow_quads[glow::QuadPos::TOP].matrix = matrix;
   quadMatrix = &glow_quads[glow::QuadPos::TOP].matrix;
 
-  x1 = border_rect.x() + glow_offset;
-  y1 = border_rect.y() - glow_size + glow_offset;
-  x2 = border_rect.x() + border_rect.width() - glow_offset;
-  y2 = border_rect.y() + glow_offset;
+  x1 = geo.x + glow_offset;
+  y1 = geo.y - glow_size + glow_offset;
+  x2 = geo.x + geo.width - glow_offset;
+  y2 = geo.y + glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position
@@ -321,10 +311,10 @@
   glow_quads[glow::QuadPos::BOTTOM].matrix = matrix;
   quadMatrix = &glow_quads[glow::QuadPos::BOTTOM].matrix;
 
-  x1 = border_rect.x() + glow_offset;
-  y1 = border_rect.y() + border_rect.height() - glow_offset;
-  x2 = border_rect.x() + border_rect.width() - glow_offset;
-  y2 = border_rect.y() + border_rect.height() + glow_size - glow_offset;
+  x1 = geo.x + glow_offset;
+  y1 = geo.y + geo.height - glow_offset;
+  x2 = geo.x + geo.width - glow_offset;
+  y2 = geo.y + geo.height + glow_size - glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position
@@ -349,10 +339,10 @@
   glow_quads[glow::QuadPos::LEFT].matrix = matrix;
   quadMatrix = &glow_quads[glow::QuadPos::LEFT].matrix;
 
-  x1 = border_rect.x() - glow_size + glow_offset;
-  y1 = border_rect.y() + glow_offset;
-  x2 = border_rect.x() + glow_offset;
-  y2 = border_rect.y() + border_rect.height() - glow_offset;
+  x1 = geo.x - glow_size + glow_offset;
+  y1 = geo.y + glow_offset;
+  x2 = geo.x + glow_offset;
+  y2 = geo.y + geo.height - glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position
@@ -377,10 +367,10 @@
   glow_quads[glow::QuadPos::RIGHT].matrix = matrix;
   quadMatrix = &glow_quads[glow::QuadPos::RIGHT].matrix;
 
-  x1 = border_rect.x() + border_rect.width() - glow_offset;
-  y1 = border_rect.y() + glow_offset;
-  x2 = border_rect.x() + border_rect.width() + glow_size - glow_offset;
-  y2 = border_rect.y() + border_rect.height() - glow_offset;
+  x1 = geo.x + geo.width - glow_offset;
+  y1 = geo.y + glow_offset;
+  x2 = geo.x + geo.width + glow_size - glow_offset;
+  y2 = geo.y + geo.height - glow_offset;
 
   /* 2x2 Matrix here, adjust both x and y scale factors
    * and the x and y position