Unset GTK_REQUEST_NEEDED before emitting ::size-request, following this

2004-10-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
	before emitting ::size-request, following this weeks discussion
	on gtk-devel-list@gnome.org.
This commit is contained in:
Matthias Clasen 2004-10-15 05:25:56 +00:00 committed by Matthias Clasen
parent d0cc5dee2b
commit 63ffb56f1e
6 changed files with 19 additions and 3 deletions

View File

@ -1,5 +1,9 @@
2004-10-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
before emitting ::size-request, following this weeks discussion
on gtk-devel-list@gnome.org.
* gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore
the size info for the current row after measuring another
row. (#154945, William Jon McCann)

View File

@ -1,5 +1,9 @@
2004-10-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
before emitting ::size-request, following this weeks discussion
on gtk-devel-list@gnome.org.
* gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore
the size info for the current row after measuring another
row. (#154945, William Jon McCann)

View File

@ -1,5 +1,9 @@
2004-10-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
before emitting ::size-request, following this weeks discussion
on gtk-devel-list@gnome.org.
* gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore
the size info for the current row after measuring another
row. (#154945, William Jon McCann)

View File

@ -1,5 +1,9 @@
2004-10-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED
before emitting ::size-request, following this weeks discussion
on gtk-devel-list@gnome.org.
* gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore
the size info for the current row after measuring another
row. (#154945, William Jon McCann)

View File

@ -1041,6 +1041,7 @@ gtk_cell_view_get_size_of_row (GtkCellView *cell_view,
GtkRequisition *requisition)
{
GtkTreeRowReference *tmp;
GtkRequisition req;
g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE);
g_return_val_if_fail (path != NULL, FALSE);

View File

@ -491,12 +491,11 @@ do_size_request (GtkWidget *widget)
{
if (GTK_WIDGET_REQUEST_NEEDED (widget))
{
gtk_widget_ensure_style (widget);
gtk_widget_ensure_style (widget);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED);
g_signal_emit_by_name (widget,
"size_request",
&widget->requisition);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED);
}
}