AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 05:01:09 +00:00
Code Issues Projects Releases Wiki Activity

Clean up the handling of clearing transient state settings, fixing bug

Browse Source 
Mon Oct  7 12:40:39 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_move_resize): Clean
        up the handling of clearing transient state
        settings, fixing bug #95026, reported by Jami
        Pekannen.
This commit is contained in:
Owen Taylor 2002-10-07 16:51:50 +00:00 committed by Owen Taylor
parent b598a4344e
commit 203d7f660f
7 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Oct 7 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Clean
up the handling of clearing transient state
settings, fixing bug #95026, reported by Jami
Pekannen.
Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch * gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Mon Oct 7 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Clean
up the handling of clearing transient state
settings, fixing bug #95026, reported by Jami
Pekannen.
Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch * gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Mon Oct 7 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Clean
up the handling of clearing transient state
settings, fixing bug #95026, reported by Jami
Pekannen.
Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch * gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Mon Oct 7 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Clean
up the handling of clearing transient state
settings, fixing bug #95026, reported by Jami
Pekannen.
Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch * gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Mon Oct 7 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Clean
up the handling of clearing transient state
settings, fixing bug #95026, reported by Jami
Pekannen.
Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch * gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Mon Oct 7 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Clean
up the handling of clearing transient state
settings, fixing bug #95026, reported by Jami
Pekannen.
Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com> Mon Oct 7 11:45:17 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch * gdk/x11/gdkkeys-x11.c (update_keymaps): If Mode_switch

26
gtk/gtkwindow.c
View File

@ -4845,6 +4845,8 @@ gtk_window_move_resize (GtkWindow *window)
gtk_widget_queue_resize (widget); /* migth recurse for GTK_RESIZE_IMMEDIATE */ gtk_widget_queue_resize (widget); /* migth recurse for GTK_RESIZE_IMMEDIATE */
} }
return; /* Bail out, we didn't really process the move/resize */
} }
else if ((configure_request_size_changed || hints_changed) && else if ((configure_request_size_changed || hints_changed) &&
(widget->allocation.width != new_request.width || (widget->allocation.width != new_request.width ||
@ -4899,16 +4901,6 @@ gtk_window_move_resize (GtkWindow *window)
/* Increment the number of have-not-yet-received-notify requests */ /* Increment the number of have-not-yet-received-notify requests */
window->configure_request_count += 1; window->configure_request_count += 1;
/* We have now sent a request since the last position constraint
* change and definitely don't need a an initial size again (not
* resetting this here can lead to infinite loops for
* GTK_RESIZE_IMMEDIATE containers)
*/
info->position_constraints_changed = FALSE;
info->initial_pos_set = FALSE;
info->resize_width = -1;
info->resize_height = -1;
/* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
* configure event in response to our resizing request. * configure event in response to our resizing request.
* the configure event will cause a new resize with * the configure event will cause a new resize with
@ -4945,14 +4937,22 @@ gtk_window_move_resize (GtkWindow *window)
else else
gdk_window_move (widget->window, gdk_window_move (widget->window,
new_request.x, new_request.y); new_request.x, new_request.y);
info->initial_pos_set = FALSE;
} }
/* And run the resize queue. /* And run the resize queue.
*/ */
gtk_container_resize_children (container); gtk_container_resize_children (container);
} }
/* We have now processed a move/resize since the last position
* constraint change, setting of the initial position, or resize.
* (Not resetting these flags here can lead to infinite loops for
* GTK_RESIZE_IMMEDIATE containers)
*/
info->position_constraints_changed = FALSE;
info->initial_pos_set = FALSE;
info->resize_width = -1;
info->resize_height = -1;
} }
/* Compare two sets of Geometry hints for equality. /* Compare two sets of Geometry hints for equality.