# HG changeset patch
# User nenolod
# Date 1162778414 28800
# Node ID d012e8d8c3b3804c5cff68a301aa8e2d5bcc26d3
# Parent  4f869110ac7b88ced77b95b611faf9a2063ba781
[svn] - fix potential display corruption problem in doublesize

diff -r 4f869110ac7b -r d012e8d8c3b3 ChangeLog
--- a/ChangeLog	Sun Nov 05 17:45:59 2006 -0800
+++ b/ChangeLog	Sun Nov 05 18:00:14 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-06 01:45:59 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2855]
+  - do not evaluate mainwinHeight() or mainwinWidth() in skin scripts if doublesize is on
+  
+  trunk/audacious/mainwin.c |    9 +++------
+  1 file changed, 3 insertions(+), 6 deletions(-)
+
+
 2006-11-05 23:09:25 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2853]
   - only use g_unichar_iswide_cjk if GLib 2.12 is available.
diff -r 4f869110ac7b -r d012e8d8c3b3 audacious/mainwin.c
--- a/audacious/mainwin.c	Sun Nov 05 17:45:59 2006 -0800
+++ b/audacious/mainwin.c	Sun Nov 05 18:00:14 2006 -0800
@@ -1031,9 +1031,6 @@
     else
         widget_hide(WIDGET(mainwin_vis));
 
-    if (cfg.doublesize)
-        return;
-
     /* window size, mainwinWidth && mainwinHeight properties */
     if (bmp_active_skin->properties.mainwin_height && bmp_active_skin->properties.mainwin_width)
     {
@@ -1041,6 +1038,10 @@
 
 	gdk_window_get_size(mainwin->window, &width, &height);
 
+        if (width == bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1) &&
+	    height == bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1))
+            return;
+
         dock_window_resize(GTK_WINDOW(mainwin), cfg.player_shaded ? MAINWIN_SHADED_WIDTH : bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1),
 		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1),
 		bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1),