X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fw-input-emoticon.cpp;h=b7afb02c83b9e5e383b7149d1267fc7ec6838f15;hb=f7b74cc1d99f7058628ec5b4b02ce6ff67d4a76d;hp=f0c64f2a6eaeaa427528b414626e4dccf5f71c20;hpb=2fec0a78789870b9b6f4d105093c8fd63e767d5c;p=platform%2Fcore%2Fuifw%2Finputdelegator.git diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp index f0c64f2..b7afb02 100755 --- a/src/w-input-emoticon.cpp +++ b/src/w-input-emoticon.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -363,7 +364,7 @@ void set_recent_emoticons(vector &emoticon_list, int val) static void _emoticon_item_clicked_cb(void *data, Evas_Object * obj, void *event_info) { - int index = (int)data; + int index = (uintptr_t)data; PRINTFUNC(DLOG_DEBUG, "index = %d", index); @@ -402,7 +403,7 @@ Evas_Object* get_emoticon_button(Evas_Object* parent, int index){ evas_object_layer_set(btn, 32000); - evas_object_smart_callback_add(btn, "clicked", _emoticon_item_clicked_cb, (void *)index); + evas_object_smart_callback_add(btn, "clicked", _emoticon_item_clicked_cb, (void *)(uintptr_t)index); return btn; } @@ -421,13 +422,13 @@ Evas_Object* get_recent_emoticon_button(Evas_Object* parent, int index){ char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length); elm_object_part_text_set(btn, "elm.text", utf_8); - evas_object_data_set(btn, "index", (void*) recent_emoji_list.at(index)); + evas_object_data_set(btn, "index", (void*)(uintptr_t) recent_emoji_list.at(index)); if (utf_8) free(utf_8); evas_object_layer_set(btn, 32000); - evas_object_smart_callback_add(btn, "clicked", _emoticon_item_clicked_cb, (void*) recent_emoji_list.at(index)); + evas_object_smart_callback_add(btn, "clicked", _emoticon_item_clicked_cb, (void*)(uintptr_t) recent_emoji_list.at(index)); return btn; } @@ -460,7 +461,7 @@ static void _emoticon_gl_content_unswallowed_cb(void *data, Evas_Object *obj, vo // PRINTFUNC(DLOG_DEBUG,"%s - stype[%s]", __func__, itc->item_style); if (!strcmp(itc->item_style, "3button_flat")) { - int index = (int)elm_object_item_data_get(it); + int index = (uintptr_t)elm_object_item_data_get(it); //PRINTFUNC(DLOG_DEBUG,"it = %p", it); PRINTFUNC(DLOG_DEBUG, "index = %d %d %d", index, index+1, index+2); @@ -474,7 +475,7 @@ static void _emoticon_gl_content_unswallowed_cb(void *data, Evas_Object *obj, vo emoticon_contents_pool[index+2].used = 0; } } else if (!strcmp(itc->item_style, "3button_flat_recent")) { - unsigned int index = (int)elm_object_item_data_get(it); + unsigned int index = (uintptr_t)elm_object_item_data_get(it); //PRINTFUNC(DLOG_DEBUG,"index = %d",index); if (index < recent_emoji_list.size()) { @@ -492,7 +493,7 @@ static void _emoticon_gl_content_unswallowed_cb(void *data, Evas_Object *obj, vo static Evas_Object * __emoticon_gl_recent_content_get(void *data, Evas_Object *obj, const char *part) { if (is_content_reuse_on) { - unsigned int index = (unsigned int)data; + unsigned int index = (uintptr_t)data; int new_index = 0; //PRINTFUNC(DLOG_DEBUG,"%s %d", part, index); @@ -518,7 +519,7 @@ static Evas_Object * __emoticon_gl_recent_content_get(void *data, Evas_Object *o return btn; } } else { - unsigned int index = (unsigned int)data; + unsigned int index = (uintptr_t)data; int new_index = 0; // PRINTFUNC(DLOG_DEBUG,"%s %d", part, index); @@ -548,7 +549,7 @@ static Evas_Object * __emoticon_gl_emoticon_content_get(void *data, Evas_Object //PRINTFUNC(DLOG_DEBUG,"%s", __func__); if (is_content_reuse_on) { - int index = (int)data; + int index = (uintptr_t)data; int new_index = 0; if (!strcmp(part, "elm.icon.1") || (!strcmp(part, "elm.icon.2")) || (!strcmp(part, "elm.icon.3"))) { @@ -575,7 +576,7 @@ static Evas_Object * __emoticon_gl_emoticon_content_get(void *data, Evas_Object const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon_info[new_index].code, 0 }; char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length); elm_object_part_text_set(btn, "elm.text", utf_8); - evas_object_data_set(btn, "index", (void*)new_index); + evas_object_data_set(btn, "index", (void*)(uintptr_t)new_index); if (utf_8) free(utf_8); @@ -588,7 +589,7 @@ static Evas_Object * __emoticon_gl_emoticon_content_get(void *data, Evas_Object return btn; } } else { - int index = (int)data; + int index = (uintptr_t)data; int new_index = 0; if (!strcmp(part, "elm.icon.1") || (!strcmp(part, "elm.icon.2")) || (!strcmp(part, "elm.icon.3"))) { @@ -722,7 +723,7 @@ static Eina_Bool _lazy_loader_cb_for_items(void *data) int i; for (i = loading_done_for_item; i < loading_top; i++ ) { if (i%3 == 0) - elm_genlist_item_append(gl, itc_emoticon, (void*)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)i); + elm_genlist_item_append(gl, itc_emoticon, (void*)(uintptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)(uintptr_t)i); } loading_done_for_item = loading_top; @@ -739,7 +740,7 @@ void _create_reusable_contents(Evas_Object *gl){ for (i = 0; i < INITAL_ITEM_UNIT; i++ ) { if (i%3 == 0) - elm_genlist_item_append(gl, itc_emoticon, (void*)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)i); + elm_genlist_item_append(gl, itc_emoticon, (void*)(uintptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)(uintptr_t)i); } lazy_loading_timer_for_items = ecore_timer_add(0.1, _lazy_loader_cb_for_items, (void *)gl); @@ -756,11 +757,12 @@ Evas_Object* _create_emoticon_genlist(void* data) if (NULL == genlist) return NULL; - Evas_Object* circle_object_genlist = eext_circle_object_genlist_add(genlist, ad->circle_surface); - eext_circle_object_genlist_scroller_policy_set(circle_object_genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); - evas_object_data_set(genlist, "circle", (void *) circle_object_genlist); - eext_rotary_object_event_activated_set(circle_object_genlist, EINA_TRUE); - + if (_WEARABLE) { + Evas_Object* circle_object_genlist = eext_circle_object_genlist_add(genlist, ad->circle_surface); + eext_circle_object_genlist_scroller_policy_set(circle_object_genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); + evas_object_data_set(genlist, "circle", (void *) circle_object_genlist); + eext_rotary_object_event_activated_set(circle_object_genlist, EINA_TRUE); + } evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(genlist); @@ -842,7 +844,7 @@ void _update_emoticon_items(void *data) for (i=0;i < recent_emoji_list.size();i=i+3) { - it = elm_genlist_item_append(gl, itc_recent, (void*)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)i); + it = elm_genlist_item_append(gl, itc_recent, (void*)(uintptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)(uintptr_t)i); } } @@ -857,7 +859,7 @@ void _update_emoticon_items(void *data) } else { // Emoticons for (i=0;i< EMOTICON_CNT;i=i+3) { - it = elm_genlist_item_append(gl, itc_emoticon, (void*)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)i); + it = elm_genlist_item_append(gl, itc_emoticon, (void*)(uintptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, (void *)(uintptr_t)i); it_last = it; } elm_genlist_item_class_free(itc_emoticon);