From ef0f67781c9da33676c6e1751781842c61320fc0 Mon Sep 17 00:00:00 2001 From: Kim Shinwoo Date: Sat, 13 Oct 2012 04:50:15 +0000 Subject: [PATCH] From: Kim Shinwoo Subject: [E-devel] [patch][elementary] conformant - use layout focus next, direction um.. there would be a reason to not use focus next and direction stuff.. please let me know why the conform does not use those.. if there is no reason, please keep the patch. thanks. SVN revision: 77947 --- legacy/elementary/ChangeLog | 5 +++++ legacy/elementary/NEWS | 3 ++- legacy/elementary/src/bin/test.c | 12 +++++++++++- legacy/elementary/src/lib/elm_conform.c | 4 ---- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 6d2cba43f7..9e4e33dd83 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -597,3 +597,8 @@ 2012-10-12 Michael Bouchaud (yoz) * Add elm_map_name_search + +2012-10-12 Shinwoo Kim (kimcinoo) + + * Fix conform widget to be part of focus chain. + diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 0066c94d06..03c77f2e2a 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -40,7 +40,8 @@ Fixes: * Fix copy&paste error in elm_flip. * Fix possible invalid memory access in elm_access. * Fix diskselector bug with more than 4 items. - + * Fix conform widget to be part of focus chain. + Removals: * All internal widget hooks (and related macros) were removed, due diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index 6fe5f414f1..18ac978284 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -398,14 +398,24 @@ my_win_main(char *autorun, Eina_Bool test_win_only) elm_object_content_set(fr, lb); evas_object_show(lb); + lb = elm_label_add(win); + elm_object_text_set(lb, "x"); + elm_box_pack_end(bx0, lb); + evas_object_show(lb); + tg = elm_check_add(win); elm_object_style_set(tg, "toggle"); - elm_object_text_set(tg, "UI-Mirroring:"); +// elm_object_text_set(tg, "UI-Mirroring:"); elm_check_state_set(tg, elm_config_mirrored_get()); evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL); elm_box_pack_end(bx0, tg); evas_object_show(tg); + lb = elm_label_add(win); + elm_object_text_set(lb, "x"); + elm_box_pack_end(bx0, lb); + evas_object_show(lb); + bx1 = elm_box_add(win); elm_box_horizontal_set(bx1, EINA_TRUE); evas_object_size_hint_weight_set(bx1, EVAS_HINT_EXPAND, 0.0); diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index 57853f41d7..e8cbd2e80e 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -542,10 +542,6 @@ _elm_conformant_smart_set_user(Elm_Conformant_Smart_Class *sc) ELM_WIDGET_CLASS(sc)->parent_set = _elm_conformant_smart_parent_set; ELM_WIDGET_CLASS(sc)->theme = _elm_conformant_smart_theme; - /* not a 'focus chain manager' */ - ELM_WIDGET_CLASS(sc)->focus_next = NULL; - ELM_WIDGET_CLASS(sc)->focus_direction = NULL; - ELM_LAYOUT_CLASS(sc)->content_aliases = _content_aliases; }