[clutter/clutter-1.22] Revert "bind-constraint: Update the preferred size"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.22] Revert "bind-constraint: Update the preferred size"
- Date: Tue, 16 Dec 2014 13:34:19 +0000 (UTC)
commit f589b6f63a2a2479a63e766f9a941a8b7820659e
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Dec 16 13:33:16 2014 +0000
Revert "bind-constraint: Update the preferred size"
This reverts commit fcc67e99bccc981774d59625b73118dadc75f6ea.
It seems this causes some recursion overflow in GNOME Shell's usage of
constraints, and needs more investigation.
clutter/clutter-bind-constraint.c | 51 -------------------------------------
1 files changed, 0 insertions(+), 51 deletions(-)
---
diff --git a/clutter/clutter-bind-constraint.c b/clutter/clutter-bind-constraint.c
index 60f5772..53cbbba 100644
--- a/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter-bind-constraint.c
@@ -147,55 +147,6 @@ source_destroyed (ClutterActor *actor,
}
static void
-clutter_bind_constraint_update_preferred_size (ClutterConstraint *constraint,
- ClutterActor *actor,
- ClutterOrientation direction,
- float for_size,
- float *minimum_size,
- float *natural_size)
-{
- ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (constraint);
- float source_min, source_nat;
-
- if (bind->source == NULL)
- return;
-
- /* only these bindings affect the preferred size */
- if (!(bind->coordinate == CLUTTER_BIND_WIDTH ||
- bind->coordinate == CLUTTER_BIND_HEIGHT ||
- bind->coordinate == CLUTTER_BIND_SIZE ||
- bind->coordinate == CLUTTER_BIND_ALL))
- return;
-
- switch (direction)
- {
- case CLUTTER_ORIENTATION_HORIZONTAL:
- if (bind->coordinate != CLUTTER_BIND_HEIGHT)
- {
- clutter_actor_get_preferred_width (bind->source, for_size,
- &source_min,
- &source_nat);
-
- *minimum_size = source_min;
- *natural_size = source_nat;
- }
- break;
-
- case CLUTTER_ORIENTATION_VERTICAL:
- if (bind->coordinate != CLUTTER_BIND_WIDTH)
- {
- clutter_actor_get_preferred_height (bind->source, for_size,
- &source_min,
- &source_nat);
-
- *minimum_size = source_min;
- *natural_size = source_nat;
- }
- break;
- }
-}
-
-static void
clutter_bind_constraint_update_allocation (ClutterConstraint *constraint,
ClutterActor *actor,
ClutterActorBox *allocation)
@@ -377,8 +328,6 @@ clutter_bind_constraint_class_init (ClutterBindConstraintClass *klass)
meta_class->set_actor = clutter_bind_constraint_set_actor;
constraint_class->update_allocation = clutter_bind_constraint_update_allocation;
- constraint_class->update_preferred_size = clutter_bind_constraint_update_preferred_size;
-
/**
* ClutterBindConstraint:source:
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]