Repair sizing algorithm - gtk_socket_size_request and

2007-08-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>

	* gtk/gtksocket.c: Repair sizing algorithm - gtk_socket_size_request
	and gtk_socket_extended_layout_get_natural_size were calling each
	other's windowing backend function. Was I drunk when commiting the
	previous revision?

svn path=/branches/extended-layout/; revision=18576
This commit is contained in:
Mathias Hasselmann
2007-08-06 09:42:03 +00:00
committed by Mathias Hasselmann
parent f1d13bd56b
commit ce7d253c48
2 changed files with 9 additions and 2 deletions

View File

@@ -1,3 +1,10 @@
2007-08-06 Mathias Hasselmann <mathias.hasselmann@gmx.de>
* gtk/gtksocket.c: Repair sizing algorithm - gtk_socket_size_request
and gtk_socket_extended_layout_get_natural_size were calling each
other's windowing backend function. Was I drunk when commiting the
previous revision?
2007-08-01 Mathias Hasselmann <mathias.hasselmann@gmx.de>
* gtk/gtkcellrenderertext.c: Provide natural size information.

View File

@@ -401,7 +401,7 @@ gtk_socket_size_request (GtkWidget *widget,
else
{
if (socket->is_mapped && !socket->have_size && socket->plug_window)
_gtk_socket_windowing_get_natural_size (socket);
_gtk_socket_windowing_size_request (socket);
if (socket->is_mapped && socket->have_size)
{
@@ -1030,7 +1030,7 @@ gtk_socket_extended_layout_get_natural_size (GtkExtendedLayout *layout,
priv = _gtk_socket_get_private (socket);
if (socket->is_mapped && !priv->have_natural_size && socket->plug_window)
_gtk_socket_windowing_size_request (socket);
_gtk_socket_windowing_get_natural_size (socket);
if (socket->is_mapped && priv->have_natural_size)
{