NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace focus_jump by focus_cycle in disabled_set 

elm_widget_disabled_set was calling focus_jump and it broke the focus tree.
Now, using focus_cycle to pass focus to next object.

Added test to disable focused button in test_focus.

SVN revision: 55408
This commit is contained in:
Tiago Rezende Campos Falcao 2010-12-09 13:07:39 +00:00
parent 2e4e9179e5
commit f3b2aaffa3
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
legacy/elementary/src/bin/test_focus.c
View File

@ -29,6 +29,20 @@ _on_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
// obj, event->keyname, evas_object_smart_parent_get(obj));
}
static void
_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *bt = data;
elm_object_disabled_set(bt, EINA_TRUE);
}
static void
_enable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *bt = data;
elm_object_disabled_set(bt, EINA_FALSE);
}
static inline void
my_show(Evas_Object *obj)
{
@ -257,7 +271,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(bt, 0.0, 0.0);
elm_box_pack_end(bx2, bt);
my_show(bt);
elm_object_focus_custom_chain_append(bx2, bt, NULL);
elm_object_focus_custom_chain_prepend(bx2, bt, NULL);
}
}
@ -269,18 +283,30 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_layout_content_set(ly, "element2", bx2);
my_show(bx2);
for (i = 3; i; i--)
{
Evas_Object *bt;
bt = elm_button_add(win);
elm_button_label_set(bt, "Box inside Layout");
elm_button_label_set(bt, "Disable");
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bt, 0.0, 0.0);
elm_box_pack_end(bx2, bt);
evas_object_smart_callback_add(bt, "clicked", _disable, bt);
my_show(bt);
elm_object_focus_custom_chain_prepend(bx2, bt, NULL);
Evas_Object *bt2;
bt2 = elm_button_add(win);
elm_button_label_set(bt2, "Enable");
evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bt2, 0.0, 0.0);
elm_box_pack_end(bx2, bt2);
evas_object_smart_callback_add(bt2, "clicked", _enable, bt);
my_show(bt2);
elm_object_focus_custom_chain_append(bx2, bt2, NULL);
}
}
}

3
legacy/elementary/src/lib/elm_widget.c
View File

@ -1704,7 +1704,8 @@ elm_widget_disabled_set(Evas_Object *obj, int disabled)
if (!o) break;
parent = o;
}
elm_widget_focus_jump(parent, 1);
if (elm_widget_focus_get(obj))
elm_widget_focus_cycle(parent, ELM_FOCUS_NEXT);
}
if (sd->disable_func) sd->disable_func(obj);
}