From 4d6ee9ea49e6e399dce614e2b3216b11c4d5f43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= Date: Wed, 15 Mar 2006 16:35:26 +0000 Subject: [PATCH] Use unset_patch() instead of unset_geometry(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wed Mar 15 11:34:54 2006 Søren Sandmann * src/c-screen.c (meta_screen_info_add_window): Use unset_patch() instead of unset_geometry(). --- ChangeLog | 5 +++++ src/c-screen.c | 7 +++++-- src/compositor.c | 2 -- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 684061ec7..bfc78b037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 15 11:34:54 2006 Søren Sandmann + + * src/c-screen.c (meta_screen_info_add_window): Use unset_patch() + instead of unset_geometry(). + Tue Mar 14 11:57:46 2006 Søren Sandmann * src/compositor.c: Comment out wobbling diff --git a/src/c-screen.c b/src/c-screen.c index 4ebc79c0b..47e3a1ef5 100644 --- a/src/c-screen.c +++ b/src/c-screen.c @@ -372,6 +372,9 @@ meta_screen_info_set_size (MetaScreenInfo *info, WsDisplay *display = WS_RESOURCE (window)->display; ws_display_begin_error_trap (display); + + g_print ("meta screen info set: %d %d %d %d\n", + x, y, width, height); cm_drawable_node_set_geometry (CM_DRAWABLE_NODE (node), &rect); shape = ws_window_get_output_shape (window); @@ -471,7 +474,7 @@ out: #if 0 g_print ("mapped\n"); #endif - cm_drawable_node_unset_geometry (node); + cm_drawable_node_unset_patch (node); cm_drawable_node_set_alpha (node, 1.0); cm_drawable_node_set_viewable (node, TRUE); cm_drawable_node_update_pixmap (node); @@ -557,7 +560,7 @@ meta_screen_info_unset_patch (MetaScreenInfo *info, CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow)); if (node) - cm_drawable_node_unset_geometry (node); + cm_drawable_node_unset_patch (node); } void diff --git a/src/compositor.c b/src/compositor.c index a2516cbf0..78de8d550 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -882,12 +882,10 @@ set_geometry (MiniInfo *info, gdouble elapsed) interpolate_rectangle (elapsed, &info->current_geometry, &info->target_geometry, &rect); -#if 0 g_print ("y: %d %d (%f => %d)\n", info->current_geometry.y, info->target_geometry.y, elapsed, rect.y); g_print ("setting: %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height); -#endif meta_screen_info_set_size (info->scr_info, get_xid (info->window),