# HG changeset patch
# User nenolod
# Date 1160027817 25200
# Node ID 27a2c571a03334ce8112954cbd6883de6bdc3517
# Parent  e0e46bce806e366a0ee76e4b76adb56845e20a48
[svn] - don't use dock_resize.

diff -r e0e46bce806e -r 27a2c571a033 ChangeLog
--- a/ChangeLog	Wed Oct 04 21:46:00 2006 -0700
+++ b/ChangeLog	Wed Oct 04 22:56:57 2006 -0700
@@ -1,3 +1,14 @@
+2006-10-05 04:46:00 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2565]
+  - mainwinEQButtonX, mainwinEQButtonY, mainwinPLButtonX, mainwinPLButtonY, mainwinAboutX,
+    mainwinAboutY, mainwinShuffleX, mainwinShuffleY, mainwinRepeatX, mainwinRepeatY.
+  
+  trunk/audacious/mainwin.c      |   49 ++++++++
+  trunk/audacious/widgets/skin.c |  229 ++++++++++++++++++++++++++++++++++++++---
+  trunk/audacious/widgets/skin.h |   36 ++++++
+  3 files changed, 301 insertions(+), 13 deletions(-)
+
+
 2006-10-05 04:05:51 +0000  Jonathan Schleifer <js@h3c.de>
   revision [2563]
   WTF, and now even a typo in the ChangeLog! (Fixed.)
diff -r e0e46bce806e -r 27a2c571a033 audacious/mainwin.c
--- a/audacious/mainwin.c	Wed Oct 04 21:46:00 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 22:56:57 2006 -0700
@@ -951,8 +951,15 @@
 
     /* window size, mainwinWidth && mainwinHeight properties */
     if (bmp_active_skin->properties.mainwin_height && bmp_active_skin->properties.mainwin_width)
-        dock_resize(dock_window_list, GTK_WINDOW(mainwin), bmp_active_skin->properties.mainwin_width,
-		bmp_active_skin->properties.mainwin_height);
+    {
+        gdk_window_set_hints(mainwin->window, 0, 0,
+				bmp_active_skin->properties.mainwin_width,
+				bmp_active_skin->properties.mainwin_height,
+				bmp_active_skin->properties.mainwin_width,
+				bmp_active_skin->properties.mainwin_height,
+                                GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
+        gtk_window_resize(GTK_WINDOW(mainwin), PLAYER_WIDTH, PLAYER_HEIGHT);
+    }
 
     /* visibility attributes */
     if (bmp_active_skin->properties.mainwin_menurow_visible)
@@ -2562,8 +2569,14 @@
     nullmask = NULL;
 
     gdk_window_set_hints(mainwin->window, 0, 0,
-                         PLAYER_WIDTH, PLAYER_HEIGHT,
-                         PLAYER_WIDTH, PLAYER_HEIGHT,
+                         !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,
+                         !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,
                          GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
     gtk_window_resize(GTK_WINDOW(mainwin), PLAYER_WIDTH, PLAYER_HEIGHT);