From: Jihoon Kim Date: Thu, 30 Sep 2010 00:49:59 +0000 (+0900) Subject: 1.0 -> EVAS_HINT_EXPAND, -1.0 -> EVAS_HINT_FILL X-Git-Tag: origin~121^2~8^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a74fb1b9a57d1766662485f6e6ea30b5dcf26b59;p=framework%2Fuifw%2Felementary.git 1.0 -> EVAS_HINT_EXPAND, -1.0 -> EVAS_HINT_FILL --- diff --git a/src/lib/elc_anchorblock.c b/src/lib/elc_anchorblock.c index 33e207e..ebd0e6b 100644 --- a/src/lib/elc_anchorblock.c +++ b/src/lib/elc_anchorblock.c @@ -198,8 +198,8 @@ elm_anchorblock_add(Evas_Object *parent) elm_entry_item_provider_prepend(wd->entry, _item_provider, obj); elm_widget_resize_object_set(obj, wd->entry); elm_entry_editable_set(wd->entry, 0); - evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0); - evas_object_size_hint_align_set(wd->entry, -1.0, -1.0); + evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); diff --git a/src/lib/elm_autocompleteview.c b/src/lib/elm_autocompleteview.c index a55a250..a3b82c6 100644 --- a/src/lib/elm_autocompleteview.c +++ b/src/lib/elm_autocompleteview.c @@ -195,8 +195,8 @@ elm_autocompleteview_add(Evas_Object *parent) wd->layout = elm_layout_add(wd->hover); elm_layout_theme_set(wd->layout,"autocompleteview","base","default"); wd->list = elm_list_add(wd->layout); - evas_object_size_hint_weight_set(wd->list, 1.0, 0.0); - evas_object_size_hint_align_set(wd->list, -1.0, -1.0); + evas_object_size_hint_weight_set(wd->list, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(wd->list, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_list_horizontal_mode_set(wd->list, ELM_LIST_COMPRESS); elm_object_style_set(wd->list,"autocompleteview"); elm_list_go(wd->list); diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index dd07c9c..5a502fd 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -2178,6 +2178,19 @@ elm_entry_password_set(Evas_Object *obj, Eina_Bool password) _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj)); elm_entry_entry_set(obj, t); + if (password) + { + if (wd->autoperiod) + { + elm_entry_autoperiod_set(obj, EINA_FALSE); + } + + if (wd->autocapitalize) + { + elm_entry_autocapitalization_set(obj, EINA_FALSE); + } + } + ic = elm_entry_imf_context_get(obj); if (ic) { diff --git a/src/lib/elm_gallery.c b/src/lib/elm_gallery.c index 7d9a5a8..c7ca9e2 100644 --- a/src/lib/elm_gallery.c +++ b/src/lib/elm_gallery.c @@ -474,7 +474,7 @@ static void _gallery_add_image(Evas_Object *obj, int index, void *data) ly = edje_object_add(evas_object_evas_get(obj)); _elm_theme_object_set(obj,ly, "gallery", "base", "default"); - evas_object_size_hint_weight_set(ly, 1.0, 1.0); + evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(ly); ic = evas_object_image_add(evas_object_evas_get(obj)); diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 5a26b27..4fb2cb0 100755 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -497,8 +497,8 @@ _item_new(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *e _mouse_up, it); evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); - evas_object_size_hint_weight_set(it->base, 1.0, 1.0); - evas_object_size_hint_align_set(it->base, -1.0, -1.0); + evas_object_size_hint_weight_set(it->base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(it->base, EVAS_HINT_FILL, EVAS_HINT_FILL); if (it->icon) { elm_widget_sub_object_add(obj, it->icon); @@ -739,8 +739,8 @@ elm_list_add(Evas_Object *parent) wd->box = elm_box_add(parent); elm_box_homogenous_set(wd->box, 1); - evas_object_size_hint_weight_set(wd->box, 1.0, 0.0); - evas_object_size_hint_align_set(wd->box, -1.0, 0.0); + evas_object_size_hint_weight_set(wd->box, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(wd->box, EVAS_HINT_FILL, 0.0); elm_scroller_content_set(wd->scr, wd->box); evas_object_show(wd->box); diff --git a/src/lib/elm_multibuttonentry.c b/src/lib/elm_multibuttonentry.c index 18f978b..ed19c81 100755 --- a/src/lib/elm_multibuttonentry.c +++ b/src/lib/elm_multibuttonentry.c @@ -458,7 +458,7 @@ _view_init(Evas_Object *obj) elm_scrolled_entry_entry_set(wd->entry, ""); elm_scrolled_entry_cursor_end_set(wd->entry); evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_KEY_UP, _evas_key_up_cb, obj); - evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0); + evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(wd->box, wd->entry); evas_object_show(wd->entry); diff --git a/src/lib/elm_pagecontrol.c b/src/lib/elm_pagecontrol.c index 5d972e5..16a8728 100644 --- a/src/lib/elm_pagecontrol.c +++ b/src/lib/elm_pagecontrol.c @@ -164,8 +164,8 @@ _create_item(Evas_Object *obj, unsigned int page_id) sprintf(pi_name, "default_%d", page_id+1); _elm_theme_object_set(obj, it->base, "page", "item", pi_name); edje_object_size_min_restricted_calc(it->base, &mw, &mh, 0, 0); - evas_object_size_hint_weight_set(it->base, 1.0, 1.0); - evas_object_size_hint_align_set(it->base, -1.0, -1.0); + evas_object_size_hint_weight_set(it->base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(it->base, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_resize(it->base, mw, mh); evas_object_size_hint_min_set(it->base, mw, mh); diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 2f4c878..0adc654 100755 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -342,8 +342,8 @@ _item_new(Evas_Object *obj, const char *label, Evas_Object *icon) } edje_object_size_min_restricted_calc(obj, &mw, &mh, 0, 0); - evas_object_size_hint_weight_set(obj, 1.0, 1.0); - evas_object_size_hint_align_set(obj, -1.0, -1.0); + evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); return it; } diff --git a/src/lib/elm_stackedicon.c b/src/lib/elm_stackedicon.c index 16aeb0d..a5b11b4 100755 --- a/src/lib/elm_stackedicon.c +++ b/src/lib/elm_stackedicon.c @@ -396,7 +396,7 @@ _add_image(Evas_Object *obj, void *data) ly = edje_object_add(evas_object_evas_get(obj)); _elm_theme_object_set(obj, ly, "stackedicon", "icon", elm_widget_style_get(obj)); - evas_object_size_hint_weight_set(ly, 1.0, 1.0); + evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_widget_sub_object_add(obj, ly); ic = evas_object_image_add(evas_object_evas_get(obj)); @@ -447,7 +447,7 @@ _add_image_to_buffer(Evas_Object *obj, Evas* e, void *data) ly = edje_object_add(e); _elm_theme_object_set(obj, ly, "stackedicon", "icon", elm_widget_style_get(obj)); - evas_object_size_hint_weight_set(ly, 1.0, 1.0); + evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ic = evas_object_image_add(e); evas_object_image_alpha_set(ic, EINA_TRUE);