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

elm_conform.c : Fix elm_conform didn't change indicator mode when create. 

currently mode change func only check one of mode between indmod or indi opacity mode.
This commit is contained in:
Jiyoun Park 2013-03-06 15:36:36 +09:00
parent 8ed79613c5
commit 3f7092477b
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/ChangeLog
View File

@ -1105,3 +1105,8 @@
* Add edje_object_message_signal_process before edje_object_size_min_restricted_calc. * Add edje_object_message_signal_process before edje_object_size_min_restricted_calc.
If the min size is changed by edje signal in edc, the the function should be called before the calculation. If the min size is changed by edje signal in edc, the the function should be called before the calculation.
2013-03-05 Jiyoun Park
* Fix elm_conform didn't change indicator mode when create.

1
legacy/elementary/NEWS
View File

@ -170,6 +170,7 @@ Fixes:
* Fix elm_index to send a signal to the selected item in smart theme. * Fix elm_index to send a signal to the selected item in smart theme.
* Focus highlight should not be shown on (0 ,0). * Focus highlight should not be shown on (0 ,0).
* Fix elm_conform didn't set size hint when keypad on. * Fix elm_conform didn't set size hint when keypad on.
* Fix elm_conform didn't change indicator mode when create.
Removals: Removals:

13
legacy/elementary/src/lib/elm_conform.c
View File

@ -538,14 +538,10 @@ _on_indicator_mode_changed(void *data,
indmode = elm_win_indicator_mode_get(win); indmode = elm_win_indicator_mode_get(win);
ind_o_mode = elm_win_indicator_opacity_get(win); ind_o_mode = elm_win_indicator_opacity_get(win);
if (indmode == sd->indmode) if (indmode != sd->indmode)
{
if (ind_o_mode == sd->ind_o_mode) return;
else _indicator_opacity_set(conformant, ind_o_mode);
}
else
_indicator_mode_set(conformant, indmode); _indicator_mode_set(conformant, indmode);
if (ind_o_mode != sd->ind_o_mode)
_indicator_opacity_set(conformant, ind_o_mode);
} }
static void static void
@ -787,8 +783,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
{ {
DBG("[KEYPAD]:ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF"); DBG("[KEYPAD]:ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF");
evas_object_size_hint_min_set(sd->virtualkeypad, -1, 0); _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
evas_object_size_hint_max_set(sd->virtualkeypad, -1, 0);
elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
evas_object_smart_callback_call(obj, SIG_VIRTUALKEYPAD_STATE_OFF, NULL); evas_object_smart_callback_call(obj, SIG_VIRTUALKEYPAD_STATE_OFF, NULL);
} }