Merge lp:~unity-team/clutk/clutk.fix-icon-clipping-on-launcher into lp:clutk

[Jay Taoko]

This is a possible fix for the clipping of icons at the right border of the launcher when dragging.

[Mirco Müller (macslow)]

Why is there also a diff for gtk-doc.make?

review: Needs Information

[Mirco Müller (macslow)]

Make sure you do "bzr diff >delta.patch" remove the gtk-doc.make related part and only apply the remainder to clutk trunk when you merge.

[lp:~unity-team/clutk/clutk.fix-icon-clipping-on-launcher]

271. By Jay Taoko on 2010-09-16

This is a possible fix for the clipping of icons at the right border of the launcher when dragging.

[Mirco Müller (macslow)]

Code is ok, compiled, runs and no clipping of icon while dragging. Approved.

review: Approve

=== modified file 'clutk/ctk-arb-asm-private.c'
--- clutk/ctk-arb-asm-private.c	2010-07-27 04:01:05 +0000
+++ clutk/ctk-arb-asm-private.c	2010-09-16 21:09:52 +0000
@@ -1054,6 +1054,7 @@
     CHECKGL( glLoadIdentity() );
   }
 
+  glDisable(GL_BLEND);
   glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
   glBegin(GL_QUADS);
   {
@@ -1070,7 +1071,7 @@
     glVertex4f(x_dst+w_dst, y_dst, 0, 1.0f);
   }
   glEnd();
-
+  glEnable(GL_BLEND);
   /* Restore model-view and projection matrices */
   {
     CHECKGL( glMatrixMode(GL_PROJECTION) );

=== modified file 'clutk/ctk-effect-cache.c'
--- clutk/ctk-effect-cache.c	2010-08-20 16:41:32 +0000
+++ clutk/ctk-effect-cache.c	2010-09-16 21:09:52 +0000
@@ -259,10 +259,14 @@
       &actor_screen_width,
       &actor_screen_height, vtx);
 
+  int BorderMargin = 10;
+  
   actor_screen_y = ceilf (actor_screen_y);
-  actor_screen_width = ceilf(actor_screen_width);
+  actor_screen_width = ceilf(actor_screen_width) + BorderMargin;
   actor_screen_height = ceilf(actor_screen_height);
   
+  
+  
   if (/*(priv->invalidate_texture_cache == TRUE) &&*/ priv->update_texture_cache)
     {
       /* reserve 2 render targets */
@@ -400,7 +404,7 @@
         1.0f,
         1.0f);
     }
-      
+
 
   /* leave and make sure the top render target on the stack is binded */
   if (top_rt)