[Glamor] [PATCH] Fixed the issue with tray icons not appearing properly in certain cases

Anthony Waters awaters1 at gmail.com
Tue Jan 14 12:28:49 PST 2014


This patch fixes the issue as described in https://bugs.freedesktop.org/show_bug.cgi?id=64738 details about the fix can be seen in comment 17

---
 src/glamor_render.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/glamor_render.c b/src/glamor_render.c
index 76a571f..21b8085 100644
--- a/src/glamor_render.c
+++ b/src/glamor_render.c
@@ -1590,16 +1590,16 @@ glamor_composite_clipped_region(CARD8 op,
 		    || source_pixmap->drawable.height != height)))) {
 		temp_src =
 		    glamor_convert_gradient_picture(screen, source,
-						    extent->x1 + x_source - x_dest,
-						    extent->y1 + y_source - y_dest,
+						    x_source,
+						    y_source,
 						    width, height);
 		if (!temp_src) {
 			temp_src = source;
 			goto out;
 		}
 		temp_src_priv = glamor_get_pixmap_private((PixmapPtr)(temp_src->pDrawable));
-		x_temp_src = - extent->x1 + x_dest;
-		y_temp_src = - extent->y1 + y_dest;
+		x_temp_src = 0;
+		y_temp_src = 0;
 	}
 
 	if (mask
@@ -1614,16 +1614,16 @@ glamor_composite_clipped_region(CARD8 op,
 		 * to do reduce one convertion. */
 		temp_mask =
 		    glamor_convert_gradient_picture(screen, mask,
-						    extent->x1 + x_mask - x_dest,
-						    extent->y1 + y_mask - y_dest,
+						    x_mask,
+						    y_mask,
 						    width, height);
 		if (!temp_mask) {
 			temp_mask = mask;
 			goto out;
 		}
 		temp_mask_priv = glamor_get_pixmap_private((PixmapPtr)(temp_mask->pDrawable));
-		x_temp_mask = - extent->x1 + x_dest;
-		y_temp_mask = - extent->y1 + y_dest;
+		x_temp_mask = 0;
+		y_temp_mask = 0;
 	}
 	/* Do two-pass PictOpOver componentAlpha, until we enable
 	 * dual source color blending.
-- 
1.8.5.2



More information about the Glamor mailing list