summaryrefslogtreecommitdiff
path: root/gtk/gtkcontainer.c
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2012-10-03 19:38:40 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2013-02-14 17:19:48 -0500
commitc4545cc5d47364b66b7ecd7bb482210fb8c8655a (patch)
tree0afc69916a4fa8f865daa658ec91b78f82c10e1b /gtk/gtkcontainer.c
parent7753883add412a4bbc6b49b9bc7ef037c5a34c36 (diff)
downloadgtk+-c4545cc5d47364b66b7ecd7bb482210fb8c8655a.tar.gz
GdkFrameClock: Make the phase explicit when requesting the frame
Instead of having gdk_frame_clock_request_frame() have gdk_frame_clock_request_phase() where we can say what phase we need. This allows us to know if we get a frame-request during layout whether it's just a request for drawing from the layout, or whether another layout phase is needed. https://bugzilla.gnome.org/show_bug.cgi?id=685460
Diffstat (limited to 'gtk/gtkcontainer.c')
-rw-r--r--gtk/gtkcontainer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 938887ea14..e73ef2a700 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1686,7 +1686,8 @@ gtk_container_idle_sizer (GdkFrameClock *clock,
}
else
{
- gdk_frame_clock_request_frame (clock);
+ gdk_frame_clock_request_phase (clock,
+ GDK_FRAME_CLOCK_PHASE_LAYOUT);
}
}
@@ -1705,7 +1706,8 @@ gtk_container_start_idle_sizer (GtkContainer *container)
container->priv->resize_clock = clock;
container->priv->resize_handler = g_signal_connect (clock, "layout",
G_CALLBACK (gtk_container_idle_sizer), container);
- gdk_frame_clock_request_frame (clock);
+ gdk_frame_clock_request_phase (clock,
+ GDK_FRAME_CLOCK_PHASE_LAYOUT);
}
static void