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

elementary/elm_win : Elementary's focus control should be started 

after the canvas gets focus. There can be a case that the canvas doesn't get
focus when elm_win is shown. 


SVN revision: 63240
This commit is contained in:
WooHyun Jung 2011-09-07 01:41:19 +00:00
parent 8cd01e8068
commit 52b792ce75
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/src/lib/elm_win.c
View File

@ -26,6 +26,7 @@ struct _Elm_Win
} shot;
Eina_Bool autodel : 1;
int *autodel_clear, rot;
int show_count;
struct {
int x, y;
} screen;
@ -306,7 +307,12 @@ _elm_win_focus_in(Ecore_Evas *ee)
if (!obj) return;
win = elm_widget_data_get(obj);
if (!win) return;
if (!elm_widget_focus_get(win->win_obj))
if (win->show_count == 1)
{
elm_object_focus_set(win->win_obj, EINA_TRUE);
win->show_count++;
}
else
elm_widget_focus_restore(win->win_obj);
evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_IN, NULL);
win->focus_highlight.cur.visible = EINA_TRUE;
@ -433,11 +439,11 @@ _deferred_ecore_evas_free(void *data)
}
static void
_elm_win_obj_callback_show(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_elm_win_obj_callback_show(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Elm_Win *win = data;
elm_object_focus_set(obj, EINA_TRUE);
if (!win->show_count) win->show_count++;
if (win->shot.info) _shot_handle(win);
}