brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout-manager: Do not emit layout-changed on thaw

Browse Source 
When thawing a LayoutManager, do not emit the ::layout-changed signal
since it might still be in the middle of a relayout.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2255
This commit is contained in:
Emmanuele Bassi 2010-08-09 11:06:44 +01:00
parent 306385c2eb
commit 28378f1bb4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/clutter-layout-manager.c
View File

@ -325,6 +325,10 @@ layout_manager_freeze_layout_change (ClutterLayoutManager *manager)
{ {
gpointer is_frozen; gpointer is_frozen;
CLUTTER_NOTE (LAYOUT, "Freezing changes for manager '%s'[%p]",
G_OBJECT_TYPE_NAME (manager),
manager);
is_frozen = g_object_get_data (G_OBJECT (manager), "freeze-change"); is_frozen = g_object_get_data (G_OBJECT (manager), "freeze-change");
if (is_frozen == NULL) if (is_frozen == NULL)
g_object_set_data (G_OBJECT (manager), "freeze-change", g_object_set_data (G_OBJECT (manager), "freeze-change",
@ -354,12 +358,13 @@ layout_manager_thaw_layout_change (ClutterLayoutManager *manager)
g_assert (level > 0); g_assert (level > 0);
CLUTTER_NOTE (LAYOUT, "Thawing changes for manager '%s'[%p]",
G_OBJECT_TYPE_NAME (manager),
manager);
level -= 1; level -= 1;
if (level == 0) if (level == 0)
{ g_object_set_data (G_OBJECT (manager), "freeze-change", NULL);
g_object_set_data (G_OBJECT (manager), "freeze-change", NULL);
clutter_layout_manager_layout_changed (manager);
}
else else
g_object_set_data (G_OBJECT (manager), "freeze-change", g_object_set_data (G_OBJECT (manager), "freeze-change",
GUINT_TO_POINTER (level)); GUINT_TO_POINTER (level));
@ -715,6 +720,10 @@ clutter_layout_manager_layout_changed (ClutterLayoutManager *manager)
is_frozen = g_object_get_data (G_OBJECT (manager), "freeze-change"); is_frozen = g_object_get_data (G_OBJECT (manager), "freeze-change");
if (is_frozen == NULL) if (is_frozen == NULL)
g_signal_emit (manager, manager_signals[LAYOUT_CHANGED], 0); g_signal_emit (manager, manager_signals[LAYOUT_CHANGED], 0);
else
CLUTTER_NOTE (LAYOUT, "Layout manager '%s'[%p] has been frozen",
G_OBJECT_TYPE_NAME (manager),
manager);
} }
/** /**