changeset 1808:ae21feb9459c trunk

[svn] - make sure all size requests match the skin size
author nenolod
date Wed, 04 Oct 2006 23:05:41 -0700
parents bd51407ce849
children deac24028172
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 04 23:02:15 2006 -0700
+++ b/ChangeLog	Wed Oct 04 23:05:41 2006 -0700
@@ -1,3 +1,12 @@
+2006-10-05 06:02:15 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2571]
+  - remove dock_resize.
+  
+  trunk/audacious/dock.c |   87 -------------------------------------------------
+  trunk/audacious/dock.h |    1 
+  2 files changed, 88 deletions(-)
+
+
 2006-10-05 06:01:26 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2569]
   - it'd probably help if we passed the right stuff to gtk_window_resize().
--- a/audacious/mainwin.c	Wed Oct 04 23:02:15 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 23:05:41 2006 -0700
@@ -2579,8 +2579,11 @@
                          !bmp_active_skin->properties.mainwin_height ? PLAYER_HEIGHT :
 				bmp_active_skin->properties.mainwin_height,
                          GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
-    gtk_window_resize(GTK_WINDOW(mainwin), PLAYER_WIDTH, PLAYER_HEIGHT);
-
+    gtk_window_resize(GTK_WINDOW(mainwin), 
+                         !bmp_active_skin->properties.mainwin_width ? PLAYER_WIDTH :
+				bmp_active_skin->properties.mainwin_width,
+                         !bmp_active_skin->properties.mainwin_height ? PLAYER_HEIGHT :
+				bmp_active_skin->properties.mainwin_height);
     if (cfg.player_x != -1 && cfg.player_y != -1)
         gtk_window_move(GTK_WINDOW(mainwin), cfg.player_x, cfg.player_y);