changeset 3946:081a8ee0c0ae

branch merge

--- a/src/audacious/skin.c	Fri Nov 16 02:49:24 2007 +0900
+++ b/src/audacious/skin.c	Fri Nov 16 02:50:52 2007 +0900
@@ -1724,20 +1724,9 @@
     g_return_if_fail(pixmap != NULL);
     g_return_if_fail(pixmap->pixmap != NULL);
 
-    /* FIXME: instead of copying stuff from SKIN_MAIN, we should use transparency or resize widget */
+    /* perhaps we should use transparency or resize widget? */
     if (xsrc+width > pixmap->width || ysrc+height > pixmap->height) {
-        if (pixmap_id == SKIN_NUMBERS) {
-            xsrc = 90;
-        } else if (pixmap_id == SKIN_MONOSTEREO) {
-            /* XMMS skins seems to have SKIN_MONOSTEREO with size 58x20 instead of 58x24 */
-            gdk_draw_drawable(drawable, gc, skin_get_pixmap(bmp_active_skin, SKIN_MAIN)->pixmap,
-                              212 + xdest, 41, xdest, ydest, width, height);
-            height = pixmap->height/2;
-        } else if (pixmap_id == SKIN_EQMAIN) {
-            /* there are skins which EQMAIN doesn't include pixmap for equalizer graph */
-            if (pixmap->height != 313) /* skins with EQMAIN which is 313 in height seems to display ok */
-                gtk_widget_hide(equalizerwin_graph);
-        } else if (widget) {
+        if (widget) {
             /* it's better to hide widget using SKIN_PLAYPAUSE/SKIN_POSBAR than display mess */
             if ((pixmap_id == SKIN_PLAYPAUSE && pixmap->width != 42) || pixmap_id == SKIN_POSBAR) {
                 gtk_widget_hide(widget);
@@ -1767,19 +1756,18 @@
                     }
                     /* let's copy what's under widget */
                     gdk_draw_drawable(drawable, gc, skin_get_pixmap(bmp_active_skin, SKIN_MAIN)->pixmap,
-                                      x + xdest, y, xdest, ydest, width, height);
+                                      x, y, xdest, ydest, width, height);
 
-                    /* some winamp skins have too strait SKIN_SHUFREP */
-                    if (pixmap_id == SKIN_SHUFREP)
-                        width = pixmap->width - xsrc;
-
-                    if (pixmap_id == SKIN_VOLUME)
-                        width = pixmap->width;
+                    /* XMMS skins seems to have SKIN_MONOSTEREO with size 58x20 instead of 58x24 */
+                    if (pixmap_id == SKIN_MONOSTEREO)
+                        height = pixmap->height/2;
                 }
             } else if (gtk_widget_get_parent(widget) == SKINNED_WINDOW(equalizerwin)->fixed) {
-                   /* TODO */
+                   if (!(pixmap_id == SKIN_EQMAIN && ysrc == 314)) /* equalizer preamp on equalizer graph */
+                         gtk_widget_hide(widget);
             } else if (gtk_widget_get_parent(widget) == SKINNED_WINDOW(playlistwin)->fixed) {
-                   /* TODO */
+                   /* I haven't seen any skin with substandard playlist */
+                   gtk_widget_hide(widget);
             }
         } else
             return;