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

Fix padding handling

Browse Source
This commit is contained in:
Matthias Clasen
2006-02-03 05:37:06 +00:00
parent afab67f99a
commit 94dc872ff5
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-02-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (get_layout_location): Fix handling
of padding in RTL. (#329099, Hooman Mesgary)
2006-02-02 Matthias Clasen <mclasen@redhat.com> 2006-02-02 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-02-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (get_layout_location): Fix handling
of padding in RTL. (#329099, Hooman Mesgary)
2006-02-02 Matthias Clasen <mclasen@redhat.com> 2006-02-02 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):

4
gtk/gtklabel.c
View File

@ -2237,9 +2237,7 @@ get_layout_location (GtkLabel *label,
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
x = MAX (x, widget->allocation.x + misc->xpad); x = MAX (x, widget->allocation.x + misc->xpad);
else else
x = MIN (x, x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
widget->allocation.x + widget->allocation.width -
req_width - misc->xpad);
y = floor (widget->allocation.y + (gint)misc->ypad y = floor (widget->allocation.y + (gint)misc->ypad
+ MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign), + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),