callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkModelButton: Remove always-zero variable

Browse Source
This commit is contained in:
Timm Bäder
2016-01-07 18:25:22 +01:00
parent bbfec07e06
commit 2f61bc1866
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkmodelbutton.c
View File

@ -887,7 +887,6 @@ gtk_model_button_allocate (GtkCssGadget *gadget,
PangoFontMetrics *metrics; PangoFontMetrics *metrics;
GtkAllocation child_allocation; GtkAllocation child_allocation;
GtkWidget *child; GtkWidget *child;
gint spacing;
gint check_min_width, check_nat_width; gint check_min_width, check_nat_width;
gint check_min_height, check_nat_height; gint check_min_height, check_nat_height;
GdkRectangle check_clip; GdkRectangle check_clip;
@ -897,7 +896,6 @@ gtk_model_button_allocate (GtkCssGadget *gadget,
child = gtk_bin_get_child (GTK_BIN (widget)); child = gtk_bin_get_child (GTK_BIN (widget));
spacing = 0;
gtk_css_gadget_get_preferred_size (button->indicator_gadget, gtk_css_gadget_get_preferred_size (button->indicator_gadget,
GTK_ORIENTATION_HORIZONTAL, GTK_ORIENTATION_HORIZONTAL,
@ -911,9 +909,9 @@ gtk_model_button_allocate (GtkCssGadget *gadget,
NULL, NULL); NULL, NULL);
if (indicator_is_left (widget)) if (indicator_is_left (widget))
child_allocation.x = allocation->x + spacing; child_allocation.x = allocation->x;
else else
child_allocation.x = allocation->x + allocation->width - check_nat_width - spacing; child_allocation.x = allocation->x + allocation->width - check_nat_width;
child_allocation.y = allocation->y + (allocation->height - check_nat_height) / 2; child_allocation.y = allocation->y + (allocation->height - check_nat_height) / 2;
child_allocation.width = check_nat_width; child_allocation.width = check_nat_width;
child_allocation.height = check_nat_height; child_allocation.height = check_nat_height;