From: Enlightenment S. <no-...@en...> - 2008-10-22 12:35:48
|
Log: and now focus works right! excellent. Author: raster Date: 2008-10-22 05:08:39 -0700 (Wed, 22 Oct 2008) New Revision: 36969 Modified: trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elc_notepad.c trunk/TMP/st/elementary/src/lib/elm_widget.c Modified: trunk/TMP/st/elementary/src/bin/test.c =================================================================== --- trunk/TMP/st/elementary/src/bin/test.c 2008-10-22 12:04:16 UTC (rev 36968) +++ trunk/TMP/st/elementary/src/bin/test.c 2008-10-22 12:08:39 UTC (rev 36969) @@ -731,9 +731,8 @@ elm_box_pack_end(bx, bx2); evas_object_show(bx2); - // FIXME: HACK! not exposed! (should expose some later?) - elm_widget_focus_set(en, 1); - + // FIXME: not exported + elm_widget_focus_set(win, 1); evas_object_show(win); } @@ -850,11 +849,10 @@ elm_box_pack_end(bx, bx2); evas_object_show(bx2); - // FIXME: HACK! not exposed! (should expose some later?) - elm_widget_focus_set(en, 1); - evas_object_resize(win, 320, 300); + // FIXME: not exported + elm_widget_focus_set(win, 1); evas_object_show(win); } @@ -948,11 +946,10 @@ elm_box_pack_end(bx, bx2); evas_object_show(bx2); - // FIXME: HACK! not exposed! (should expose some later?) - elm_widget_focus_set(np, 1); - evas_object_resize(win, 320, 300); + // FIXME: not exported + elm_widget_focus_set(win, 1); evas_object_show(win); } Modified: trunk/TMP/st/elementary/src/lib/elc_notepad.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_notepad.c 2008-10-22 12:04:16 UTC (rev 36968) +++ trunk/TMP/st/elementary/src/lib/elc_notepad.c 2008-10-22 12:08:39 UTC (rev 36969) @@ -46,7 +46,7 @@ _on_focus_hook(void *data, Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - elm_widget_focus_set(wd->entry, 1); + elm_widget_focus_steal(wd->entry); } static char * Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_widget.c 2008-10-22 12:04:16 UTC (rev 36968) +++ trunk/TMP/st/elementary/src/lib/elm_widget.c 2008-10-22 12:08:39 UTC (rev 36969) @@ -62,18 +62,8 @@ { Smart_Data *sd = data; Evas_Object *op, *op2; - - op = elm_widget_parent_get(obj); - while (op) - { - op2 = elm_widget_parent_get(op); - if (!op2) break; - op = op2; - } - printf("focus off %p\n", op); - if (op) elm_widget_focused_object_clear(op); - printf("focus %p\n", sd->obj); - elm_widget_focus_set(sd->obj, 0); + + elm_widget_focus_steal(sd->obj); } /* externally accessible functions */ |