rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=25d6172cd22d8877682c3ad3b556bb5b9f0adbcd
commit 25d6172cd22d8877682c3ad3b556bb5b9f0adbcd
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Fri Feb 3 14:49:07 2017 +0200
property_group: disable the color controls accordingly to effect val
@fix
Change-Id: Ia96995c3f01605bc3c6439e7904661dd4f1d07a1
---
src/bin/ui/property/property_group.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/bin/ui/property/property_group.c
b/src/bin/ui/property/property_group.c
index 3609367..c17ff74 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -1727,6 +1727,7 @@ _update_cb(Property_Attribute *pa, Property_Action
*action)
Eina_Stringshare *str_val1, *str_val2;
Eina_List *images_list, *l;
char *code;
+ Edje_Text_Effect effect;
assert(pa != NULL);
assert(action != NULL);
@@ -1858,6 +1859,8 @@ _update_cb(Property_Attribute *pa, Property_Action
*action)
return editor_state_fill_type_default_is(EDIT_OBJ, STATE_ARGS);
case ATTRIBUTE_PART_TEXT_EFFECT:
elm_object_text_set(action->control, text_effect_strings[(int)
edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS)]);
+
property_item_update(&group_pd.items[PROPERTY_GROUP_ITEM_STATE_COLORS_OUTLINE_COLOR]);
+
property_item_update(&group_pd.items[PROPERTY_GROUP_ITEM_STATE_COLORS_SHADOWCOLOR]);
return editor_part_text_effect_default_is(EDIT_OBJ, PART_ARGS);
case ATTRIBUTE_PART_TEXT_SHADOW_DIRECTION:
/* shodow directions are shifted by 4 in enum */
@@ -2279,10 +2282,27 @@ _update_cb(Property_Attribute *pa, Property_Action
*action)
case ATTRIBUTE_STATE_OUTLINE_COLOR:
edje_edit_state_outline_color_get(EDIT_OBJ, STATE_ARGS, &int_val1,
&int_val2, &int_val3, &int_val4);
property_color_control_color_set(action->control, int_val1, int_val2,
int_val3, int_val4);
+ effect = edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS);
+ if ((EDJE_TEXT_EFFECT_OUTLINE == effect) ||
+ (EDJE_TEXT_EFFECT_SOFT_OUTLINE == effect) ||
+ (EDJE_TEXT_EFFECT_OUTLINE_SHADOW == effect) ||
+ (EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW == effect))
+ elm_object_disabled_set(action->control, false);
+ else
+ elm_object_disabled_set(action->control, true);
return editor_state_outline_color_default_is(EDIT_OBJ, STATE_ARGS);
case ATTRIBUTE_STATE_SHADOW_COLOR:
edje_edit_state_shadow_color_get(EDIT_OBJ, STATE_ARGS, &int_val1,
&int_val2, &int_val3, &int_val4);
property_color_control_color_set(action->control, int_val1, int_val2,
int_val3, int_val4);
+ effect = edje_edit_part_text_effect_get(EDIT_OBJ, PART_ARGS);
+ if ((EDJE_TEXT_EFFECT_SHADOW == effect) ||
+ (EDJE_TEXT_EFFECT_SOFT_SHADOW == effect) ||
+ (EDJE_TEXT_EFFECT_OUTLINE_SHADOW == effect) ||
+ (EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW == effect))
+ elm_object_disabled_set(action->control, false);
+ else
+ elm_object_disabled_set(action->control, true);
+
return editor_state_shadow_color_default_is(EDIT_OBJ, STATE_ARGS);
case ATTRIBUTE_STATE_COLOR_CLASS:
elm_genlist_clear(action->control);
--
