From c82e82dafc507469f48547702841f0946a888104 Mon Sep 17 00:00:00 2001 From: Gnome CVS User Date: Tue, 25 Nov 1997 06:49:03 +0000 Subject: [PATCH] gtk-dairiki-971117-0.patch Clear window when aspect ratio or alignment is changed. -Jay --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkaspectframe.c | 13 +++++++++++-- 8 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bb799ab5ac..252d02a93b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Nov 24 1997 Jay Painter + * gtk/gtkaspectframe.c (gtk_aspect_frame_set): + gtk-dairiki-971117-0.patch + Clear window when aspect ratio or alignment is changed. + Mon Nov 24 1997 Jay Painter * gtk/gtkobject.h: fixed GTK_OBJECT_NSIGNALS macro diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 2e4795bcae..2e6594fea8 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -124,13 +124,22 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame, (aspect_frame->ratio != ratio) || (aspect_frame->obey_child != obey_child)) { + GtkWidget * this = GTK_WIDGET(aspect_frame); + aspect_frame->xalign = xalign; aspect_frame->yalign = yalign; aspect_frame->ratio = ratio; aspect_frame->obey_child = obey_child; - gtk_widget_size_allocate (GTK_WIDGET (aspect_frame), &(GTK_WIDGET (aspect_frame)->allocation)); - gtk_widget_queue_draw (GTK_WIDGET (aspect_frame)); + if (GTK_WIDGET_MAPPED(this)) + gdk_window_clear_area (this->window, + this->allocation.x, + this->allocation.y, + this->allocation.width, + this->allocation.height); + + gtk_widget_size_allocate (this, &this->allocation); + gtk_widget_queue_draw (this); } }