# HG changeset patch # User Tomasz Mon # Date 1183975633 -7200 # Node ID 99865f696f13b69afd4221cf1b8750d25f72f5a3 # Parent 6cb0f58e7e7d1507565d5c31a39bee077c261b46 don't use gtk_widget_set_uposition() diff -r 6cb0f58e7e7d -r 99865f696f13 src/audacious/ui_skinned_button.c --- a/src/audacious/ui_skinned_button.c Sun Jul 08 20:36:10 2007 +0200 +++ b/src/audacious/ui_skinned_button.c Mon Jul 09 12:07:13 2007 +0200 @@ -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 6cb0f58e7e7d -r 99865f696f13 src/audacious/ui_skinned_number.c --- a/src/audacious/ui_skinned_number.c Sun Jul 08 20:36:10 2007 +0200 +++ b/src/audacious/ui_skinned_number.c Mon Jul 09 12:07:13 2007 +0200 @@ -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 6cb0f58e7e7d -r 99865f696f13 src/audacious/ui_skinned_textbox.c --- a/src/audacious/ui_skinned_textbox.c Sun Jul 08 20:36:10 2007 +0200 +++ b/src/audacious/ui_skinned_textbox.c Mon Jul 09 12:07:13 2007 +0200 @@ -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)); }