diff options
| author | Gnome CVS User <gnomecvs@src.gnome.org> | 1997-11-26 02:36:43 +0000 |
|---|---|---|
| committer | Gnome CVS User <gnomecvs@src.gnome.org> | 1997-11-26 02:36:43 +0000 |
| commit | e522ad46baaef62bb639a3a120c59203cb0af847 (patch) | |
| tree | 084aa2739a3195db960fc8d0d8772a176924f400 /gtk/gtkframe.c | |
| parent | aedb8717f13d126b7bf9c8a4db028579d564156a (diff) | |
| download | gtk+-e522ad46baaef62bb639a3a120c59203cb0af847.tar.gz | |
gtk/gtkaspectframe.c:
Some minor improvements to rounding in aspectframes.
Make sure that child allocation is always >= 0
Always trigger size allocation with gtk_widget_queue_resize
to prevent calling size_allocate before allocation done.
gtk/gtkframe.c:
Changed tests for drawability to GTK_WIDGET_DRAWABLE
Always trigger size allocation with gtk_widget_queue_resize
to prevent calling size_allocate before allocation done.
Diffstat (limited to 'gtk/gtkframe.c')
| -rw-r--r-- | gtk/gtkframe.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index fe78897432..a3160307eb 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -144,8 +144,9 @@ gtk_frame_set_label (GtkFrame *frame, widget->allocation.width - GTK_CONTAINER (frame)->border_width, widget->allocation.y + frame->label_height); - gtk_widget_queue_resize (GTK_WIDGET (frame)); } + + gtk_widget_queue_resize (GTK_WIDGET (frame)); } void @@ -164,7 +165,7 @@ gtk_frame_set_label_align (GtkFrame *frame, frame->label_xalign = xalign; frame->label_yalign = yalign; - if (GTK_WIDGET_VISIBLE (frame)) + if (GTK_WIDGET_DRAWABLE (frame)) { GtkWidget *widget; @@ -177,9 +178,8 @@ gtk_frame_set_label_align (GtkFrame *frame, widget->allocation.width - GTK_CONTAINER (frame)->border_width, widget->allocation.y + frame->label_height); - gtk_widget_size_allocate (GTK_WIDGET (frame), &(GTK_WIDGET (frame)->allocation)); - gtk_widget_queue_draw (GTK_WIDGET (frame)); } + gtk_widget_queue_resize (GTK_WIDGET (frame)); } } @@ -194,16 +194,15 @@ gtk_frame_set_shadow_type (GtkFrame *frame, { frame->shadow_type = type; - if (GTK_WIDGET_MAPPED (frame)) + if (GTK_WIDGET_DRAWABLE (frame)) { gdk_window_clear_area (GTK_WIDGET (frame)->window, GTK_WIDGET (frame)->allocation.x, GTK_WIDGET (frame)->allocation.y, GTK_WIDGET (frame)->allocation.width, GTK_WIDGET (frame)->allocation.height); - gtk_widget_size_allocate (GTK_WIDGET (frame), &(GTK_WIDGET (frame)->allocation)); - gtk_widget_queue_draw (GTK_WIDGET (frame)); } + gtk_widget_queue_resize (GTK_WIDGET (frame)); } } |