Don't for the creation of geometry info here. (#114533)

2006-03-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_compute_configure_request): Don't
	for the creation of geometry info here.  (#114533)
This commit is contained in:
Matthias Clasen 2006-03-13 03:32:11 +00:00 committed by Matthias Clasen
parent 26d8e72852
commit a83b615863
3 changed files with 25 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2006-03-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_compute_configure_request): Don't
for the creation of geometry info here. (#114533)
2006-03-11 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdrawable-win32.c (draw_polygon): Use Polygon() for

View File

@ -1,3 +1,8 @@
2006-03-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_compute_configure_request): Don't
for the creation of geometry info here. (#114533)
2006-03-11 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdrawable-win32.c (draw_polygon): Use Polygon() for

View File

@ -5260,12 +5260,21 @@ gtk_window_compute_configure_request (GtkWindow *window,
parent_widget = (GtkWidget*) window->transient_parent;
pos = get_effective_position (window);
info = gtk_window_get_geometry_info (window, TRUE);
/* by default, don't change position requested */
x = info->last.configure_request.x;
y = info->last.configure_request.y;
info = gtk_window_get_geometry_info (window, FALSE);
/* by default, don't change position requested */
if (info)
{
x = info->last.configure_request.x;
y = info->last.configure_request.y;
}
else
{
x = 0;
y = 0;
}
if (window->need_default_position)
{
@ -5358,7 +5367,7 @@ gtk_window_compute_configure_request (GtkWindow *window,
}
} /* if (window->need_default_position) */
if (window->need_default_position &&
if (window->need_default_position && info &&
info->initial_pos_set)
{
x = info->initial_x;