# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1183976030 18000
# Node ID 034d16dfdd440315909289f9cfc27a2662904f1d
# Parent  a5f606b0103850dfaff62b28b364d78b66329818# Parent  d891850c4042bb4fbf857f176dbf79398fed8aaa
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r a5f606b01038 -r 034d16dfdd44 src/audacious/ui_skinned_button.c
--- a/src/audacious/ui_skinned_button.c	Mon Jul 09 05:13:41 2007 -0500
+++ b/src/audacious/ui_skinned_button.c	Mon Jul 09 05:13:50 2007 -0500
@@ -233,8 +233,12 @@
     UiSkinnedButton *button = UI_SKINNED_BUTTON (widget);
     UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button);
     widget->allocation = *allocation;
+    widget->allocation.x *= (1+priv->double_size);
+    widget->allocation.y *= (1+priv->double_size);
+
     if (GTK_WIDGET_REALIZED (widget))
-        gdk_window_move_resize(widget->window, allocation->x, allocation->y, allocation->width, allocation->height);
+        gdk_window_move_resize(widget->window, allocation->x*(1+priv->double_size), allocation->y*(1+priv->double_size), allocation->width, allocation->height);
+
     button->x = widget->allocation.x/(priv->double_size ? 2 : 1);
     button->y = widget->allocation.y/(priv->double_size ? 2 : 1);
     priv->move_x = 0;
@@ -467,7 +471,6 @@
     priv->double_size = !priv->double_size;
 
     gtk_widget_set_size_request(widget, priv->w*(1+priv->double_size), priv->h*(1+priv->double_size));
-    gtk_widget_set_uposition(widget, button->x*(1+priv->double_size), button->y*(1+priv->double_size));
 
     gtk_widget_queue_draw(widget);
 }
diff -r a5f606b01038 -r 034d16dfdd44 src/audacious/ui_skinned_number.c
--- a/src/audacious/ui_skinned_number.c	Mon Jul 09 05:13:41 2007 -0500
+++ b/src/audacious/ui_skinned_number.c	Mon Jul 09 05:13:50 2007 -0500
@@ -180,8 +180,10 @@
     UiSkinnedNumber *number = UI_SKINNED_NUMBER (widget);
 
     widget->allocation = *allocation;
+    widget->allocation.x *= (1+number->double_size);
+    widget->allocation.y *= (1+number->double_size);
     if (GTK_WIDGET_REALIZED (widget))
-        gdk_window_move_resize(widget->window, allocation->x, allocation->y, allocation->width, allocation->height);
+        gdk_window_move_resize(widget->window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
 
     number->x = widget->allocation.x/(number->double_size ? 2 : 1);
     number->y = widget->allocation.y/(number->double_size ? 2 : 1);
@@ -250,7 +252,6 @@
     number->double_size = !number->double_size;
 
     gtk_widget_set_size_request(widget, number->width*(1+number->double_size), number->height*(1+number->double_size));
-    gtk_widget_set_uposition(widget, number->x*(1+number->double_size), number->y*(1+number->double_size));
 
     gtk_widget_queue_draw(GTK_WIDGET(number));
 }
diff -r a5f606b01038 -r 034d16dfdd44 src/audacious/ui_skinned_textbox.c
--- a/src/audacious/ui_skinned_textbox.c	Mon Jul 09 05:13:41 2007 -0500
+++ b/src/audacious/ui_skinned_textbox.c	Mon Jul 09 05:13:50 2007 -0500
@@ -262,8 +262,10 @@
     UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox);
 
     widget->allocation = *allocation;
+    widget->allocation.x *= (1+priv->double_size);
+    widget->allocation.y *= (1+priv->double_size);
     if (GTK_WIDGET_REALIZED (widget))
-        gdk_window_move_resize(widget->window, allocation->x, allocation->y, allocation->width, allocation->height);
+        gdk_window_move_resize(widget->window, widget->allocation.x, widget->allocation.y, allocation->width, allocation->height);
 
     textbox->x = widget->allocation.x/(priv->double_size ? 2 : 1);
     textbox->y = widget->allocation.y/(priv->double_size ? 2 : 1);
@@ -434,7 +436,6 @@
     priv->double_size = !priv->double_size;
 
     gtk_widget_set_size_request(widget, textbox->width*(1+priv->double_size), textbox->height*(1+priv->double_size));
-    gtk_widget_set_uposition(widget, textbox->x*(1+priv->double_size), textbox->y*(1+priv->double_size));
 
     gtk_widget_queue_draw(GTK_WIDGET(textbox));
 }