Commit 2ef6d354 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Modify all of the GtkMisc widgets to round down on centering calculations

2005-06-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkarrow.c:
	* gtk/gtkimage.c:
	* gtk/gtklabel.c:
	* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
	on centering calculations to match the behaviour of other parts
	of GTK+. (#307419, Ryan Lortie)
parent 50807a61
2005-06-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkarrow.c:
* gtk/gtkimage.c:
* gtk/gtklabel.c:
* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
on centering calculations to match the behaviour of other parts
of GTK+. (#307419, Ryan Lortie)
2005-06-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_source_set): Connect to
......
2005-06-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkarrow.c:
* gtk/gtkimage.c:
* gtk/gtklabel.c:
* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
on centering calculations to match the behaviour of other parts
of GTK+. (#307419, Ryan Lortie)
2005-06-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_source_set): Connect to
......
2005-06-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkarrow.c:
* gtk/gtkimage.c:
* gtk/gtklabel.c:
* gtk/gtkpixmap.c: Modify all of the GtkMisc widgets to round down
on centering calculations to match the behaviour of other parts
of GTK+. (#307419, Ryan Lortie)
2005-06-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_source_set): Connect to
......
......@@ -260,11 +260,9 @@ gtk_arrow_expose (GtkWidget *widget,
}
x = floor (widget->allocation.x + misc->xpad
+ ((widget->allocation.width - extent) * xalign)
+ 0.5);
+ ((widget->allocation.width - extent) * xalign));
y = floor (widget->allocation.y + misc->ypad
+ ((widget->allocation.height - extent) * misc->yalign)
+ 0.5);
+ ((widget->allocation.height - extent) * misc->yalign));
shadow_type = arrow->shadow_type;
......
......@@ -1576,11 +1576,9 @@ gtk_image_expose (GtkWidget *widget,
xalign = 1.0 - misc->xalign;
x = floor (widget->allocation.x + misc->xpad
+ ((widget->allocation.width - widget->requisition.width) * xalign)
+ 0.5);
+ ((widget->allocation.width - widget->requisition.width) * xalign));
y = floor (widget->allocation.y + misc->ypad
+ ((widget->allocation.height - widget->requisition.height) * misc->yalign)
+ 0.5);
+ ((widget->allocation.height - widget->requisition.height) * misc->yalign));
mask_x = x;
mask_y = y;
......
......@@ -2177,8 +2177,7 @@ get_layout_location (GtkLabel *label,
req_width = widget->requisition.width;
x = floor (widget->allocation.x + (gint)misc->xpad +
xalign * (widget->allocation.width - req_width)
+ 0.5);
xalign * (widget->allocation.width - req_width));
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
x = MAX (x, widget->allocation.x + misc->xpad);
......@@ -2188,8 +2187,8 @@ get_layout_location (GtkLabel *label,
req_width - misc->xpad);
y = floor (widget->allocation.y + (gint)misc->ypad
+ MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign)
+ 0.5, 0));
+ MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
0));
if (xp)
*xp = x;
......
......@@ -212,11 +212,9 @@ gtk_pixmap_expose (GtkWidget *widget,
xalign = 1.0 - misc->xalign;
x = floor (widget->allocation.x + misc->xpad
+ ((widget->allocation.width - widget->requisition.width) * xalign)
+ 0.5);
+ ((widget->allocation.width - widget->requisition.width) * xalign));
y = floor (widget->allocation.y + misc->ypad
+ ((widget->allocation.height - widget->requisition.height) * misc->yalign)
+ 0.5);
+ ((widget->allocation.height - widget->requisition.height) * misc->yalign));
if (pixmap->mask)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment