jypark pushed a commit to branch master.
commit 530f89edfb7018c58dc314079c2d8e185f1bb061
Author: Jiyoun Park <[email protected]>
Date: Wed Mar 6 15:36:36 2013 +0900
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.
---
ChangeLog | 5 +++++
NEWS | 1 +
src/lib/elm_conform.c | 13 ++++---------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e33eac5..1642b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1105,3 +1105,8 @@
* 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.
+
+2013-03-05 Jiyoun Park
+
+ * Fix elm_conform didn't change indicator mode when create.
+
diff --git a/NEWS b/NEWS
index 01ecdb9..3637528 100644
--- a/NEWS
+++ b/NEWS
@@ -170,6 +170,7 @@ Fixes:
* Fix elm_index to send a signal to the selected item in smart theme.
* 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 change indicator mode when create.
Removals:
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index e2eeb3a..439b2c6 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -538,14 +538,10 @@ _on_indicator_mode_changed(void *data,
indmode = elm_win_indicator_mode_get(win);
ind_o_mode = elm_win_indicator_opacity_get(win);
- if (indmode == sd->indmode)
- {
- if (ind_o_mode == sd->ind_o_mode) return;
- else _indicator_opacity_set(conformant, ind_o_mode);
- }
- else
+ if (indmode != sd->indmode)
_indicator_mode_set(conformant, indmode);
-
+ if (ind_o_mode != sd->ind_o_mode)
+ _indicator_opacity_set(conformant, ind_o_mode);
}
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)
{
DBG("[KEYPAD]:ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF");
- evas_object_size_hint_min_set(sd->virtualkeypad, -1, 0);
- evas_object_size_hint_max_set(sd->virtualkeypad, -1, 0);
+ _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
evas_object_smart_callback_call(obj, SIG_VIRTUALKEYPAD_STATE_OFF,
NULL);
}
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
