diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-12-27 21:42:02 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-12-27 21:42:02 +0000 |
| commit | 6d51fcd95ac41a3d9c003d2e10f307c563690816 (patch) | |
| tree | 66c2f1b1dc361e9011ccbffb8f98c2da427dcdd5 /gtk/gtkarrow.c | |
| parent | 7aeb18a51ce57f538a2af9a6e53413bc665d7616 (diff) | |
| download | gtk+-6d51fcd95ac41a3d9c003d2e10f307c563690816.tar.gz | |
Make interpretation of misc->xpad/ypad consistent with GtkLabel. Do
Thu Dec 27 16:05:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkarrow.c gtk/gtkimage.c gtkpixmap.c: Make interpretation
of misc->xpad/ypad consistent with GtkLabel. Do
directional flipping when interpreting misc->xalign/yalign.
Fix off-by-one error for negative x,y. (#67472, reported
by Mathieu Lacage)
Diffstat (limited to 'gtk/gtkarrow.c')
| -rw-r--r-- | gtk/gtkarrow.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index c859297c94..cb27a51dd8 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -24,6 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#include <math.h> #include "gtkarrow.h" #include "gtkintl.h" @@ -231,6 +232,7 @@ gtk_arrow_expose (GtkWidget *widget, gint width, height; gint x, y; gint extent; + gfloat xalign; g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_ARROW (widget), FALSE); @@ -245,11 +247,18 @@ gtk_arrow_expose (GtkWidget *widget, height = widget->allocation.height - misc->ypad * 2; extent = MIN (width, height); - x = ((widget->allocation.x + misc->xpad) * (1.0 - misc->xalign) + - (widget->allocation.x + widget->allocation.width - extent - misc->xpad) * misc->xalign); - y = ((widget->allocation.y + misc->ypad) * (1.0 - misc->yalign) + - (widget->allocation.y + widget->allocation.height - extent - misc->ypad) * misc->yalign); - + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) + xalign = misc->xalign; + else + xalign = 1.0 - misc->xalign; + + x = floor (widget->allocation.x + misc->xpad + + ((widget->allocation.width - extent) * xalign) + + 0.5); + y = floor (widget->allocation.y + misc->ypad + + ((widget->allocation.height - extent) * misc->yalign) + + 0.5); + shadow_type = arrow->shadow_type; if (widget->state == GTK_STATE_ACTIVE) |