changeset 1538:fe671cb74bf9 trunk

[svn] - fix geometry hinting so that it is ICCCM compliant. patch by whereami. Also fixes: composite and xgl!
author nenolod
date Tue, 08 Aug 2006 23:43:33 -0700
parents f9816e12c724
children 850f1eba9cbd
files ChangeLog audacious/ui_playlist.c
diffstat 2 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 08 22:39:42 2006 -0700
+++ b/ChangeLog	Tue Aug 08 23:43:33 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-09 05:39:42 +0000  George Averill <nhjm449@gmail.com>
+  revision [1988]
+  - Fix misspelling of flac (bug #545)
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/configure.ac  
+
+
 2006-08-08 19:33:55 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1986]
   - oops
--- a/audacious/ui_playlist.c	Tue Aug 08 22:39:42 2006 -0700
+++ b/audacious/ui_playlist.c	Tue Aug 08 23:43:33 2006 -0700
@@ -298,12 +298,16 @@
 gint
 playlistwin_get_width(void)
 {
+    cfg.playlist_width /= PLAYLISTWIN_WIDTH_SNAP;
+    cfg.playlist_width *= PLAYLISTWIN_WIDTH_SNAP;
     return cfg.playlist_width;
 }
 
 gint
 playlistwin_get_height_unshaded(void)
 {
+    cfg.playlist_height /= PLAYLISTWIN_HEIGHT_SNAP;
+    cfg.playlist_height *= PLAYLISTWIN_HEIGHT_SNAP;
     gint height = cfg.playlist_height;
     return height;
 }
@@ -506,7 +510,6 @@
 
     geometry.min_width = PLAYLISTWIN_MIN_WIDTH;
     geometry.max_width = G_MAXUINT16;
-    geometry.base_width = cfg.playlist_width;
 
     geometry.width_inc = PLAYLISTWIN_WIDTH_SNAP;
     geometry.height_inc = PLAYLISTWIN_HEIGHT_SNAP;
@@ -519,11 +522,9 @@
     else {
         geometry.min_height = PLAYLISTWIN_MIN_HEIGHT;
         geometry.max_height = G_MAXUINT16;
-        geometry.base_height = cfg.playlist_height;
     }
 
-    mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_RESIZE_INC |
-           GDK_HINT_BASE_SIZE;
+    mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_RESIZE_INC;
 
     gtk_window_set_geometry_hints(GTK_WINDOW(playlistwin),
                                   playlistwin, &geometry, mask);
@@ -559,7 +560,7 @@
     playlistwin_set_geometry_hints(cfg.playlist_shaded);
 
     gtk_window_resize(GTK_WINDOW(playlistwin),
-                      cfg.playlist_width,
+                      playlistwin_get_width(),
                       playlistwin_get_height());
 
     playlistwin_set_mask();