From f892c3ae83aec4b5d5af9c04a8662c156baa9126 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Thu, 4 Apr 2013 15:00:15 +0900 Subject: [PATCH] [elm_win] changed code for setting xwindow type --- src/lib/elm_win.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index a141514..b76202c 100755 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -221,6 +221,7 @@ static void _elm_win_resize_objects_eval(Evas_Object *obj); #ifdef HAVE_ELEMENTARY_X static void _elm_win_xwin_update(Elm_Win_Smart_Data *sd); +static void _elm_win_xwin_type_set(Elm_Win_Smart_Data *sd); #endif static void @@ -1827,6 +1828,22 @@ _elm_win_xwin_update(Elm_Win_Smart_Data *sd) } } + ecore_x_e_virtual_keyboard_state_set + (sd->x.xwin, (Ecore_X_Virtual_Keyboard_State)sd->kbdmode); + if (sd->indmode == ELM_WIN_INDICATOR_SHOW) + ecore_x_e_illume_indicator_state_set + (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON); + else if (sd->indmode == ELM_WIN_INDICATOR_HIDE) + ecore_x_e_illume_indicator_state_set + (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); +} + +static void +__elm_win_xwin_type_set(Elm_Win_Smart_Data *sd) +{ + _elm_win_xwindow_get(sd); + if (!sd->x.xwin) return; /* nothing more to do */ + switch (sd->type) { case ELM_WIN_BASIC: @@ -1891,16 +1908,9 @@ _elm_win_xwin_update(Elm_Win_Smart_Data *sd) default: break; } - ecore_x_e_virtual_keyboard_state_set - (sd->x.xwin, (Ecore_X_Virtual_Keyboard_State)sd->kbdmode); - if (sd->indmode == ELM_WIN_INDICATOR_SHOW) - ecore_x_e_illume_indicator_state_set - (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON); - else if (sd->indmode == ELM_WIN_INDICATOR_HIDE) - ecore_x_e_illume_indicator_state_set - (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); -} + return; +} #endif @@ -2930,6 +2940,7 @@ elm_win_add(Evas_Object *parent, evas_font_hinting_set(sd->evas, EVAS_FONT_HINTING_BYTECODE); #ifdef HAVE_ELEMENTARY_X + _elm_win_xwin_type_set(sd); _elm_win_xwin_update(sd); #endif -- 2.7.4