AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Back out accidental commit of debugging timing code

Browse Source 
Wed Nov 14 15:14:48 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
	out accidental commit of debugging timing code
This commit is contained in:
Owen Taylor 2001-11-14 20:20:03 +00:00 committed by Owen Taylor
parent a433d5c5c1
commit 82a6dc9365
8 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_idle_sizer): Back
out accidental commit of debugging timing code.
2001-11-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so

62
gtk/gtkcontainer.c
View File

@ -966,52 +966,32 @@ gtk_container_get_resize_container (GtkContainer *container)
static gboolean
gtk_container_idle_sizer (gpointer data)
{
static gboolean initialized = 0;
static GTimeVal last_time;
GTimeVal current_time;
GDK_THREADS_ENTER ();
if (container_resize_queue)
/* we may be invoked with a container_resize_queue of NULL, because
* queue_resize could have been adding an extra idle function while
* the queue still got processed. we better just ignore such case
* than trying to explicitely work around them with some extra flags,
* since it doesn't cause any actual harm.
*/
while (container_resize_queue)
{
/* we may be invoked with a container_resize_queue of NULL, because
* queue_resize could have been adding an extra idle function while
* the queue still got processed. we better just ignore such case
* than trying to explicitely work around them with some extra flags,
* since it doesn't cause any actual harm.
*/
while (container_resize_queue)
{
GSList *slist;
GtkWidget *widget;
slist = container_resize_queue;
container_resize_queue = slist->next;
widget = slist->data;
g_slist_free_1 (slist);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
gtk_container_check_resize (GTK_CONTAINER (widget));
}
gdk_window_process_all_updates ();
g_get_current_time (&current_time);
if (initialized)
{
gdouble diff = ((current_time.tv_usec - last_time.tv_usec) / 1000. +
(current_time.tv_sec - last_time.tv_sec) * 1000.);
/* g_print ("Frame time: %g msec\n", diff); */
}
else
initialized = TRUE;
last_time = current_time;
GDK_THREADS_LEAVE ();
GSList *slist;
GtkWidget *widget;
slist = container_resize_queue;
container_resize_queue = slist->next;
widget = slist->data;
g_slist_free_1 (slist);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
gtk_container_check_resize (GTK_CONTAINER (widget));
}
gdk_window_process_all_updates ();
GDK_THREADS_LEAVE ();
return FALSE;
}