diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-08-10 17:32:29 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-08-10 17:32:29 +0000 |
| commit | c540438b913f60696e969b93d1bd9d1a5fef5af0 (patch) | |
| tree | 4e13eaad03fe42b2a0285c01bc92f3614f69b3fc | |
| parent | 154e38e71ee73d06c9e10d4eff43622ecdc6eb94 (diff) | |
| download | metacity-c540438b913f60696e969b93d1bd9d1a5fef5af0.tar.gz | |
be sure window is mapped if we unmanage it and it's not withdrawn; bug
2002-08-10 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_free): be sure window is
mapped if we unmanage it and it's not withdrawn;
bug #90369
* src/screen.c (meta_screen_new): change string
s/override/replace/ bug #89077
* src/theme.c (scale_and_alpha_pixbuf): dump the
sometimes-use-NEAREST-instead-of-BILINEAR optimization,
bug #87489
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/screen.c | 2 | ||||
| -rw-r--r-- | src/theme.c | 16 | ||||
| -rw-r--r-- | src/window.c | 16 |
4 files changed, 29 insertions, 18 deletions
@@ -1,5 +1,18 @@ 2002-08-10 Havoc Pennington <hp@pobox.com> + * src/window.c (meta_window_free): be sure window is + mapped if we unmanage it and it's not withdrawn; + bug #90369 + + * src/screen.c (meta_screen_new): change string + s/override/replace/ bug #89077 + + * src/theme.c (scale_and_alpha_pixbuf): dump the + sometimes-use-NEAREST-instead-of-BILINEAR optimization, + bug #87489 + +2002-08-10 Havoc Pennington <hp@pobox.com> + * src/window.c (menu_callback): raise window when moving to another workspace bug #88896 diff --git a/src/screen.c b/src/screen.c index 999d3dbd..9319f7f4 100644 --- a/src/screen.c +++ b/src/screen.c @@ -218,7 +218,7 @@ meta_screen_new (MetaDisplay *display, if (!replace_current_wm) { - meta_warning (_("Screen %d on display \"%s\" already has a window manager; try using the --replace option to override the current window manager.\n"), + meta_warning (_("Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"), number, display->name); return NULL; diff --git a/src/theme.c b/src/theme.c index cc5e73db..34e0240e 100644 --- a/src/theme.c +++ b/src/theme.c @@ -2633,19 +2633,9 @@ scale_and_alpha_pixbuf (GdkPixbuf *src, switch (fill_type) { case META_IMAGE_FILL_SCALE: - if (gdk_pixbuf_get_width (pixbuf) == width || - gdk_pixbuf_get_height (pixbuf) == height) - { - pixbuf = gdk_pixbuf_scale_simple (pixbuf, - width, height, - GDK_INTERP_NEAREST); - } - else - { - pixbuf = gdk_pixbuf_scale_simple (pixbuf, - width, height, - GDK_INTERP_BILINEAR); - } + pixbuf = gdk_pixbuf_scale_simple (pixbuf, + width, height, + GDK_INTERP_BILINEAR); break; case META_IMAGE_FILL_TILE: pixbuf = pixbuf_tile (pixbuf, width, height); diff --git a/src/window.c b/src/window.c index 2a3b9243..95d7608f 100644 --- a/src/window.c +++ b/src/window.c @@ -869,7 +869,10 @@ meta_window_free (MetaWindow *window) meta_stack_remove (window->screen->stack, window); /* FIXME restore original size if window has maximized */ - + + if (window->frame) + meta_window_destroy_frame (window); + if (window->withdrawn) { /* We need to clean off the window's state so it @@ -897,10 +900,15 @@ meta_window_free (MetaWindow *window) set_wm_state (window, NormalState); meta_error_trap_pop (window->display); } + + /* And we need to be sure the window is mapped so other WMs + * know that it isn't Withdrawn + */ + meta_error_trap_push (window->display); + XMapWindow (window->display->xdisplay, + window->xwindow); + meta_error_trap_pop (window->display); } - - if (window->frame) - meta_window_destroy_frame (window); meta_window_ungrab_keys (window); meta_display_ungrab_window_buttons (window->display, window->xwindow); |