diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-12 04:07:34 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-12 04:07:34 +0000 |
| commit | a01b78860cddccde1f108524146399044c06a0df (patch) | |
| tree | 8665d26b8a305b32fcb814808d54d8b6a4e6db35 | |
| parent | b1a004c1ba4ac142ea77f876305a686518b50c10 (diff) | |
| download | gtk+-a01b78860cddccde1f108524146399044c06a0df.tar.gz | |
when extending the draw rectangle by the "draw-border" style property,
* gtk/gtkwidget.c (gtk_widget_get_draw_rectangle): when extending
the draw rectangle by the "draw-border" style property, subtract
"left" from "x" and "top" from "y", not the other way around.
Noticed by Michael Natterer
svn path=/branches/gtk-2-12/; revision=21363
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -2,6 +2,15 @@ Merged from trunk: + * gtk/gtkwidget.c (gtk_widget_get_draw_rectangle): when extending + the draw rectangle by the "draw-border" style property, subtract + "left" from "x" and "top" from "y", not the other way around. + Noticed by Michael Natterer + +2008-09-11 Matthias Clasen <mclasen@redhat.com> + + Merged from trunk: + Bug 550528 - IconView DND interface does not work if only used as source diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f7dc2304e7..87f905cf39 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3455,8 +3455,8 @@ gtk_widget_get_draw_rectangle (GtkWidget *widget, NULL); if (draw_border) { - rect->x -= draw_border->top; - rect->y -= draw_border->left; + rect->x -= draw_border->left; + rect->y -= draw_border->top; rect->width += draw_border->left + draw_border->right; rect->height += draw_border->top + draw_border->bottom; |