label: Compute label offset properly for wrapped justified labels

label offsets were computed wrong for wrapped or ellipsized labels that
were right- or center-justified and had excess space available.
This commit is contained in:
Benjamin Otte 2011-05-05 17:30:58 +02:00
parent 278260a3ae
commit 33e6479554

View File

@ -3949,12 +3949,7 @@ get_layout_location (GtkLabel *label,
gtk_widget_get_allocation (widget, &allocation);
x = floor (allocation.x + xpad + xalign * (allocation.width - req_width));
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
x = MAX (x, allocation.x + xpad);
else
x = MIN (x, allocation.x + allocation.width - xpad);
x = floor (allocation.x + xpad + xalign * (allocation.width - req_width) - logical.x);
/* bgo#315462 - For single-line labels, *do* align the requisition with