isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

MetaWindowGroup: Fix bad merge

Browse Source 
I accidentally committed merge indicators: fix compilation.
This commit is contained in:
Owen W. Taylor 2012-08-15 22:46:23 -04:00
parent c27b4b7cfc
commit 7a2a6e2675
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor/meta-window-group.c
View File

@ -186,13 +186,9 @@ meta_window_group_paint (ClutterActor *actor)
ClutterActor *stage; ClutterActor *stage;
cairo_rectangle_int_t visible_rect, unredirected_rect; cairo_rectangle_int_t visible_rect, unredirected_rect;
GList *children, *l; GList *children, *l;
<<<<<<< HEAD
gfloat group_x, group_y;
=======
int paint_x_origin, paint_y_origin; int paint_x_origin, paint_y_origin;
int actor_x_origin, actor_y_origin; int actor_x_origin, actor_y_origin;
int paint_x_offset, paint_y_offset; int paint_x_offset, paint_y_offset;
>>>>>>> MetaWindowGroup: Handle painting inside a ClutterClone
MetaWindowGroup *window_group = META_WINDOW_GROUP (actor); MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen); MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
@ -226,8 +222,6 @@ meta_window_group_paint (ClutterActor *actor)
unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect); unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect);
} }
clutter_actor_get_position (CLUTTER_ACTOR (window_group), &group_x, &group_y);
/* We walk the list from top to bottom (opposite of painting order), /* We walk the list from top to bottom (opposite of painting order),
* and subtract the opaque area of each window out of the visible * and subtract the opaque area of each window out of the visible
* region that we pass to the windows below. * region that we pass to the windows below.