# HG changeset patch # User John Lindgren # Date 1241130224 14400 # Node ID 9978be206b93f6e983cf7866bdf2788a55b79bb6 # Parent 2a8eb3450ea48912c1a1e6a821ed702788189fb2 Clean up some of the roll-up code so that it no longer causes problems with metacity/xfwm4. (How? I don't know.) diff -r 2a8eb3450ea4 -r 9978be206b93 src/skins/ui_dock.c --- a/src/skins/ui_dock.c Thu Apr 30 18:14:57 2009 -0400 +++ b/src/skins/ui_dock.c Thu Apr 30 18:23:44 2009 -0400 @@ -325,10 +325,9 @@ hints.min_height = new_h; hints.max_width = new_w; hints.max_height = new_h; - - gdk_window_resize(GTK_WIDGET(widget)->window, new_w, new_h); - gdk_window_set_geometry_hints(GTK_WIDGET(widget)->window, &hints, - GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE); + gtk_window_resize (widget, new_w, new_h); + gtk_window_set_geometry_hints (widget, 0, & hints, + GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE); } void @@ -414,7 +413,6 @@ } g_list_free(slist); free_docked_list(docked_list); - gtk_window_move(widget, x, y + off_y - (new_h - h)); dock_window_resize(widget, w, new_h, w, h); } diff -r 2a8eb3450ea4 -r 9978be206b93 src/skins/ui_playlist.c --- a/src/skins/ui_playlist.c Thu Apr 30 18:14:57 2009 -0400 +++ b/src/skins/ui_playlist.c Thu Apr 30 18:23:44 2009 -0400 @@ -354,10 +354,6 @@ playlistwin_get_height()); playlistwin_set_geometry_hints(config.playlist_shaded); - - gtk_window_resize(GTK_WINDOW(playlistwin), - playlistwin_get_width(), - playlistwin_get_height()); } static void @@ -366,8 +362,6 @@ GtkAction *action = gtk_action_group_get_action( toggleaction_group_others , "roll up playlist editor" ); gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(action) , shaded ); - - playlistwin_set_shade(shaded); playlistwin_update_list(aud_playlist_get_active()); }