# HG changeset patch
# User nenolod
# Date 1160028580 25200
# Node ID deac24028172d37d69037b4bf87250a9498f8a16
# Parent  ae21feb9459cf97f64b620a9e7067c28841a3c32
[svn] - more hardcoded values removed

diff -r ae21feb9459c -r deac24028172 ChangeLog
--- a/ChangeLog	Wed Oct 04 23:05:41 2006 -0700
+++ b/ChangeLog	Wed Oct 04 23:09:40 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-05 06:05:41 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2573]
+  - make sure all size requests match the skin size
+  
+  trunk/audacious/mainwin.c |    7 +++++--
+  1 file changed, 5 insertions(+), 2 deletions(-)
+
+
 2006-10-05 06:02:15 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2571]
   - remove dock_resize.
diff -r ae21feb9459c -r deac24028172 audacious/mainwin.c
--- a/audacious/mainwin.c	Wed Oct 04 23:05:41 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 23:09:40 2006 -0700
@@ -544,22 +544,24 @@
 
         textbox_set_scroll(mainwin_info, FALSE);
         if (bmp_playback_get_playing())
-		{
+	{
             	widget_show(WIDGET(mainwin_sposition));
 	        widget_show(WIDGET(mainwin_stime_min));
         	widget_show(WIDGET(mainwin_stime_sec));
-		}
+	}
 	else
-		{
+	{
             	widget_hide(WIDGET(mainwin_sposition));
 	        widget_hide(WIDGET(mainwin_stime_min));
         	widget_hide(WIDGET(mainwin_stime_sec));
-		}
-	
+	}
+
         mainwin_shade->pb_ny = mainwin_shade->pb_py = 27;
     }
     else {
-        dock_shade(dock_window_list, GTK_WINDOW(mainwin), MAINWIN_HEIGHT);
+        dock_shade(dock_window_list, GTK_WINDOW(mainwin),
+		!bmp_active_skin->properties.mainwin_height ? MAINWIN_HEIGHT :
+		     bmp_active_skin->properties.mainwin_height);
 
         widget_hide(WIDGET(mainwin_svis));
         svis_clear_data(mainwin_svis);
@@ -728,8 +730,8 @@
     if (force) {
         if (!cfg.player_shaded)
             skin_draw_pixmap(bmp_active_skin, mainwin_bg, mainwin_gc,
-                             SKIN_MAIN, 0, 0, 0, 0, MAINWIN_WIDTH,
-                             MAINWIN_HEIGHT);
+                             SKIN_MAIN, 0, 0, 0, 0, bmp_active_skin->properties.mainwin_width,
+                             bmp_active_skin->properties.mainwin_height);
         mainwin_draw_titlebar(gtk_window_has_toplevel_focus
                               (GTK_WINDOW(mainwin)));
     }
@@ -3459,7 +3461,7 @@
     gtk_window_set_resizable(GTK_WINDOW(mainwin), FALSE);
 
     width = MAINWIN_WIDTH;
-    height = cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : MAINWIN_HEIGHT;
+    height = cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height;
 
     gtk_widget_set_size_request(mainwin, width, height);
     gtk_widget_set_app_paintable(mainwin, TRUE);