The visible signal should be called when it is reloaded in _theme_hook_item.

[framework/uifw/elementary.git] / src / lib / elc_multibuttonentry.c

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 67d125d..431aad8 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -2,7 +2,7 @@
 #include "elm_priv.h"
 
 #define MAX_STR 256
-#define MIN_W_ENTRY 10
+#define MIN_W_ENTRY 160
 
 typedef enum _Multibuttonentry_Pos
   {
@@ -64,8 +64,8 @@ struct _Widget_Data
      MultiButtonEntry_Closed_Button_Type end_type;
 
      Eina_List *items;
-     Eina_List *current;
      Eina_List *filter_list;
+     Elm_Object_Item *selected_it; /* selected item */
 
      const char *labeltxt, *guidetexttxt;
 
@@ -161,7 +161,7 @@ _del_hook(Evas_Object *obj)
           }
         wd->items = NULL;
      }
-   wd->current = NULL;
+   wd->selected_it = NULL;
 
    if (wd->labeltxt) eina_stringshare_del(wd->labeltxt);
    if (wd->guidetexttxt) eina_stringshare_del(wd->guidetexttxt);
@@ -204,11 +204,11 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
 
    if (elm_widget_focus_get(obj))
      {
-        if ((wd->current))
+        if ((wd->selected_it))
           {
              elm_entry_input_panel_show(wd->entry);
           }
-        else if (((!wd->current) || (!eina_list_count(wd->items))))
+        else if (((!wd->selected_it) || (!eina_list_count(wd->items))))
           {
              if (wd->entry) elm_entry_cursor_end_set(wd->entry);
              _view_update(obj);
@@ -270,6 +270,7 @@ _signal_mouse_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emiss
    _view_update(data);
 
    elm_entry_input_panel_show(wd->entry);
+   elm_object_focus_set(wd->entry, EINA_TRUE);
 
    evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
 }
@@ -343,6 +344,9 @@ _set_vis_guidetext(Evas_Object *obj)
    elm_box_unpack(wd->box, wd->entry);
    if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
 
+   if (!wd->focused)
+     elm_object_focus_set(wd->entry, EINA_FALSE);
+
    if (wd && (!eina_list_count(wd->items)) && wd->guidetext
        && (!elm_widget_focus_get(obj)) && (!wd->focused) && (!wd->n_str))
      {
@@ -357,7 +361,7 @@ _set_vis_guidetext(Evas_Object *obj)
         elm_box_pack_end(wd->box, wd->entry);
         evas_object_show(wd->entry);
         if (elm_widget_focus_get(obj) || wd->focused)
-          if (!wd->current)
+          if (!wd->selected_it)
             elm_object_focus_set(wd->entry, EINA_TRUE);
         wd->view_state = MULTIBUTTONENTRY_VIEW_ENTRY;
      }
@@ -583,34 +587,34 @@ _set_label(Evas_Object *obj, const char *str)
    if (!wd || !str) return;
    eina_stringshare_replace(&wd->labeltxt, str);
    if (wd->label)
-   {
-      Evas_Coord width, height, sum_width = 0;
-      evas_object_size_hint_min_set(wd->label, 0, 0);
-      evas_object_resize(wd->label, 0, 0);
-      edje_object_part_text_set(wd->label, "mbe.label", str);
-
-      if (!strcmp(str, ""))
-        {
-           /* FIXME: not work yet */
-           edje_object_signal_emit(wd->label, "elm,mbe,clear_text", "");
-           edje_object_part_geometry_get(wd->label, "mbe.label", NULL, NULL, &width, &height);
-           sum_width += width;
-        }
-      else
-        {
-           edje_object_signal_emit(wd->label, "elm,mbe,set_text", "");
-           edje_object_part_geometry_get(wd->label, "mbe.label", NULL, NULL, &width, &height);
-
-           sum_width += width;
-
-           edje_object_part_geometry_get(wd->label, "mbe.label.left.padding", NULL, NULL, &width, NULL);
-           sum_width += width;
-
-           edje_object_part_geometry_get(wd->label, "mbe.label.right.padding", NULL, NULL, &width, NULL);
-           sum_width += width;
-        }
-      evas_object_size_hint_min_set(wd->label, sum_width, height);
-   }
+     {
+        Evas_Coord width, height, sum_width = 0;
+        evas_object_size_hint_min_set(wd->label, 0, 0);
+        evas_object_resize(wd->label, 0, 0);
+        edje_object_part_text_escaped_set(wd->label, "mbe.label", str);
+
+        if (!strcmp(str, ""))
+          {
+             /* FIXME: not work yet */
+             edje_object_signal_emit(wd->label, "elm,mbe,clear_text", "");
+             edje_object_part_geometry_get(wd->label, "mbe.label", NULL, NULL, &width, &height);
+             sum_width += width;
+          }
+        else
+          {
+             edje_object_signal_emit(wd->label, "elm,mbe,set_text", "");
+             edje_object_part_geometry_get(wd->label, "mbe.label", NULL, NULL, &width, &height);
+
+             sum_width += width;
+
+             edje_object_part_geometry_get(wd->label, "mbe.label.left.padding", NULL, NULL, &width, NULL);
+             sum_width += width;
+
+             edje_object_part_geometry_get(wd->label, "mbe.label.right.padding", NULL, NULL, &width, NULL);
+             sum_width += width;
+          }
+        evas_object_size_hint_min_set(wd->label, sum_width, height);
+     }
    evas_object_show(wd->label);
    _view_update(obj);
 }
@@ -633,7 +637,7 @@ _set_guidetext(Evas_Object *obj, const char *str)
         evas_object_size_hint_weight_set(wd->guidetext, 0.0, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(wd->guidetext, EVAS_HINT_FILL,
                                                            EVAS_HINT_FILL);
-        edje_object_part_text_set(wd->guidetext, "elm.text", str);
+        edje_object_part_text_escaped_set(wd->guidetext, "elm.text", str);
         _view_update(obj);
      }
 }
@@ -645,25 +649,24 @@ _change_current_button_state(Evas_Object *obj, Multibuttonentry_Button_State sta
    Elm_Multibuttonentry_Item *item = NULL;
 
    if (!wd) return;
-   if (wd->current)
-     item = eina_list_data_get(wd->current);
+   item = (Elm_Multibuttonentry_Item *)wd->selected_it;
 
    if (item && item->button)
      {
         switch (state)
           {
-             case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
-                edje_object_signal_emit(item->button, "default", "");
-                wd->current = NULL;
-                break;
-             case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
-                edje_object_signal_emit(item->button, "focused", "");
-                evas_object_smart_callback_call(obj, SIG_ITEM_SELECTED, item);
-                break;
-             default:
-                edje_object_signal_emit(item->button, "default", "");
-                wd->current = NULL;
-                break;
+           case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
+              edje_object_signal_emit(item->button, "default", "");
+              wd->selected_it = NULL;
+              break;
+           case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
+              edje_object_signal_emit(item->button, "focused", "");
+              evas_object_smart_callback_call(obj, SIG_ITEM_SELECTED, item);
+              break;
+           default:
+              edje_object_signal_emit(item->button, "default", "");
+              wd->selected_it = NULL;
+              break;
           }
      }
 }
@@ -685,7 +688,7 @@ _change_current_button(Evas_Object *obj, Evas_Object *btn)
      {
         if (item->button == btn)
           {
-             wd->current = l;
+             wd->selected_it = (Elm_Object_Item *)item;
              break;
           }
      }
@@ -701,10 +704,10 @@ _button_clicked(void *data, Evas_Object *obj, const char *emission __UNUSED__, c
    Elm_Multibuttonentry_Item *item = NULL;
    if (!wd || wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
 
-   _change_current_button(data, obj);
+   _select_button(data, obj);
 
-   if (wd->current)
-     if ((item = eina_list_data_get(wd->current)) != NULL)
+   if (wd->selected_it)
+     if ((item = (Elm_Multibuttonentry_Item *)wd->selected_it) != NULL)
        {
           evas_object_smart_callback_call(data, SIG_ITEM_CLICKED, item);
           _select_button(data, item->button);
@@ -743,8 +746,8 @@ _del_button_item(Elm_Multibuttonentry_Item *item)
 
              _del_button_obj(obj, _item->button);
 
-             if (wd->current == l)
-               wd->current = NULL;
+             if (wd->selected_it == (Elm_Object_Item *)_item)
+               wd->selected_it = NULL;
              break;
           }
      }
@@ -782,7 +785,7 @@ static void
 _resize_button(Evas_Object *btn, Evas_Coord *realw, Evas_Coord *vieww)
 {
    Evas_Coord rw, vw;
-   Evas_Coord w_text, h_btn, padding_outer, padding_inner = 0;
+   Evas_Coord w_text, h_btn, padding_outer = 0;
    Evas_Coord w_btn = 0, button_max_width = 0;
    const char *size_str;
 
@@ -793,7 +796,7 @@ _resize_button(Evas_Object *btn, Evas_Coord *realw, Evas_Coord *vieww)
    edje_object_part_geometry_get(btn, "elm.base", NULL, NULL, NULL, &h_btn);
    edje_object_part_geometry_get(btn, "elm.btn.text", NULL, NULL, &w_text, NULL);
    edje_object_part_geometry_get(btn, "right.padding", NULL, NULL, &padding_outer, NULL);
-   w_btn = w_text + 2*padding_outer + 2*padding_inner;
+   w_btn = w_text + (2 * padding_outer);
 
    rw = w_btn;
 
@@ -846,7 +849,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
    elm_object_text_set(wd->entry, "");
 
    _elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj));
-   edje_object_part_text_set(btn, "elm.btn.text", str_utf8);
+   edje_object_part_text_escaped_set(btn, "elm.btn.text", str_utf8);
    edje_object_part_geometry_get(btn, "elm.btn.text", NULL, NULL, &width, &height);
 
    evas_object_size_hint_min_set(btn, width, height);
@@ -877,93 +880,93 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
 
         switch (pos)
           {
-             case MULTIBUTTONENTRY_POS_START:
-                wd->items = eina_list_prepend(wd->items, item);
-                if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
-                  {
-                     elm_widget_sub_object_add(obj, btn);
-                     _shrink_mode_set(obj, EINA_TRUE);
-                  }
-                else
-                  {
-                     if (wd->label)
-                       elm_box_pack_after(wd->box, btn, wd->label);
-                     else
-                       elm_box_pack_start(wd->box, btn);
-                     if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
-                       _set_vis_guidetext(obj);
-                  }
-                break;
-             case MULTIBUTTONENTRY_POS_END:
+           case MULTIBUTTONENTRY_POS_START:
+              wd->items = eina_list_prepend(wd->items, item);
+              if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
+                {
+                   elm_widget_sub_object_add(obj, btn);
+                   _shrink_mode_set(obj, EINA_TRUE);
+                }
+              else
+                {
+                   if (wd->label)
+                     elm_box_pack_after(wd->box, btn, wd->label);
+                   else
+                     elm_box_pack_start(wd->box, btn);
+                   if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
+                     _set_vis_guidetext(obj);
+                }
+              break;
+           case MULTIBUTTONENTRY_POS_END:
+              wd->items = eina_list_append(wd->items, item);
+              if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
+                {
+                   elm_widget_sub_object_add(obj, btn);
+                   evas_object_hide(btn);
+                }
+              else
+                {
+                   if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
+                     _set_vis_guidetext(obj);
+                   if (wd->entry)
+                     elm_box_pack_before(wd->box, btn, wd->entry);
+                   else
+                     elm_box_pack_end(wd->box, btn);
+                }
+              break;
+           case MULTIBUTTONENTRY_POS_BEFORE:
+              if (reference)
+                wd->items = eina_list_prepend_relative(wd->items, item, reference);
+              else
                 wd->items = eina_list_append(wd->items, item);
-                if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
-                  {
-                     elm_widget_sub_object_add(obj, btn);
-                     evas_object_hide(btn);
-                  }
-                else
-                  {
-                     if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
-                       _set_vis_guidetext(obj);
-                     if (wd->entry)
-                       elm_box_pack_before(wd->box, btn, wd->entry);
-                     else
-                       elm_box_pack_end(wd->box, btn);
-                  }
-                break;
-             case MULTIBUTTONENTRY_POS_BEFORE:
-                if (reference)
-                     wd->items = eina_list_prepend_relative(wd->items, item, reference);
-                else
-                     wd->items = eina_list_append(wd->items, item);
-                if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
-                  {
-                     elm_widget_sub_object_add(obj, btn);
-                     evas_object_hide(btn);
-                     _shrink_mode_set(obj, EINA_TRUE);
-                  }
-                else
-                  {
-                     if (reference)
-                       elm_box_pack_before(wd->box, btn, reference->button);
-                     else
-                       {
-                          if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
-                            _set_vis_guidetext(obj);
-                          if (wd->entry)
-                            elm_box_pack_before(wd->box, btn, wd->entry);
-                          else
-                            elm_box_pack_end(wd->box, btn);
-                       }
-                  }
-                break;
-             case MULTIBUTTONENTRY_POS_AFTER:
-                if (reference)
-                     wd->items = eina_list_append_relative(wd->items, item, reference);
-                else
-                     wd->items = eina_list_append(wd->items, item);
-                if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
-                  {
-                     elm_widget_sub_object_add(obj, btn);
-                     _shrink_mode_set(obj, EINA_TRUE);
-                  }
-                else
-                  {
-                     if (reference)
-                       elm_box_pack_after(wd->box, btn, reference->button);
-                     else
-                       {
-                          if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
-                            _set_vis_guidetext(obj);
-                          if (wd->entry)
-                            elm_box_pack_before(wd->box, btn, wd->entry);
-                          else
-                            elm_box_pack_end(wd->box, btn);
-                       }
-                  }
-                break;
-             default:
-                break;
+              if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
+                {
+                   elm_widget_sub_object_add(obj, btn);
+                   evas_object_hide(btn);
+                   _shrink_mode_set(obj, EINA_TRUE);
+                }
+              else
+                {
+                   if (reference)
+                     elm_box_pack_before(wd->box, btn, reference->button);
+                   else
+                     {
+                        if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
+                          _set_vis_guidetext(obj);
+                        if (wd->entry)
+                          elm_box_pack_before(wd->box, btn, wd->entry);
+                        else
+                          elm_box_pack_end(wd->box, btn);
+                     }
+                }
+              break;
+           case MULTIBUTTONENTRY_POS_AFTER:
+              if (reference)
+                wd->items = eina_list_append_relative(wd->items, item, reference);
+              else
+                wd->items = eina_list_append(wd->items, item);
+              if (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK)
+                {
+                   elm_widget_sub_object_add(obj, btn);
+                   _shrink_mode_set(obj, EINA_TRUE);
+                }
+              else
+                {
+                   if (reference)
+                     elm_box_pack_after(wd->box, btn, reference->button);
+                   else
+                     {
+                        if (wd->view_state == MULTIBUTTONENTRY_VIEW_GUIDETEXT)
+                          _set_vis_guidetext(obj);
+                        if (wd->entry)
+                          elm_box_pack_before(wd->box, btn, wd->entry);
+                        else
+                          elm_box_pack_end(wd->box, btn);
+                     }
+                }
+              break;
+           default:
+              break;
           }
      }
    evas_object_smart_callback_call(obj, SIG_ITEM_ADDED, item);
@@ -1003,11 +1006,11 @@ _evas_mbe_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 
    if (wd->last_btn_select)
      {
-        if (wd->current &&
+        if (wd->selected_it &&
             ((strcmp(ev->keyname, "BackSpace") == 0) ||
              (strcmp(ev->keyname, "Delete") == 0)))
           {
-             item = eina_list_data_get(wd->current);
+             item = (Elm_Multibuttonentry_Item *)wd->selected_it;
              if (item)
                {
                   _del_button_item(item);
@@ -1015,7 +1018,7 @@ _evas_mbe_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
                   elm_object_focus_set(wd->entry, EINA_TRUE);
                }
           }
-        else if (((!wd->current && (wd->n_str == 0) &&
+        else if (((!wd->selected_it && (wd->n_str == 0) &&
                    (strcmp(ev->keyname, "BackSpace") == 0)) ||
                    (strcmp(ev->keyname, "Delete") == 0)))
           {
@@ -1076,9 +1079,9 @@ _entry_focus_in_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
 
    if (!wd) return;
 
-   if (wd->current)
+   if (wd->selected_it)
      {
-        item = eina_list_data_get(wd->current);
+        item = (Elm_Multibuttonentry_Item *)wd->selected_it;
         elm_object_focus_set(wd->entry, EINA_FALSE);
         evas_object_focus_set(item->button, EINA_TRUE);
      }
@@ -1113,17 +1116,14 @@ static void
 _entry_resized_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Coord en_x, en_y, en_w, en_h;
-   Evas_Coord bx_x, bx_y;
 
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
 
    evas_object_geometry_get(wd->entry, &en_x, &en_y, &en_w, &en_h);
-   evas_object_geometry_get(wd->box, &bx_x, &bx_y, NULL, NULL);
 
    if (wd->focused)
-     elm_widget_show_region_set(wd->box, en_x - bx_x, en_y - bx_y, en_w,
-                                en_h, EINA_TRUE);
+     elm_widget_show_region_set(wd->entry, en_x, en_y, en_w, en_h, EINA_TRUE);
 }
 
 static void
@@ -1155,6 +1155,7 @@ _view_init(Evas_Object *obj)
      {
         wd->entry = elm_entry_add(obj);
         if (!wd->entry) return;
+        elm_entry_scrollable_set(wd->entry, EINA_TRUE);
         elm_entry_single_line_set(wd->entry, EINA_TRUE);
         elm_object_text_set(wd->entry, "");
         elm_entry_input_panel_enabled_set(wd->entry, EINA_FALSE);
@@ -1193,8 +1194,8 @@ _view_init(Evas_Object *obj)
              if (size_str) button_min_height = (Evas_Coord)atoi(size_str);
 
              wd->end_type = MULTIBUTTONENTRY_CLOSED_IMAGE;
-             evas_object_size_hint_min_set(wd->end, 
-                                           button_min_width * _elm_config->scale, 
+             evas_object_size_hint_min_set(wd->end,
+                                           button_min_width * _elm_config->scale,
                                            button_min_height * _elm_config->scale);
              elm_widget_sub_object_add(obj, wd->end);
           }
@@ -1224,6 +1225,9 @@ _calculate_box_min_size(Evas_Object *box, Evas_Object_Box_Data *priv)
 
         if (wx)
           {
+             if ((elm_widget_is(opt->obj)) && (!(strcmp(elm_widget_type_get(opt->obj), "entry"))) && (mnw == -1))
+               mnw = MIN_W_ENTRY;
+
              if (mnw != -1 && (w - cw) >= mnw)
                ww = w - cw;
              else
@@ -1265,6 +1269,9 @@ _calculate_item_max_height(Evas_Object *box, Evas_Object_Box_Data *priv, int obj
 
         if (wx)
           {
+             if ((elm_widget_is(opt->obj)) && (!(strcmp(elm_widget_type_get(opt->obj), "entry"))) && (mnw == -1))
+               mnw = MIN_W_ENTRY;
+
              if (mnw != -1 && (w - cw) >= mnw)
                 ww = w - cw;
              else
@@ -1339,6 +1346,9 @@ _box_layout_cb(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__
 
         if (wx)
           {
+             if ((elm_widget_is(obj)) && (!(strcmp(elm_widget_type_get(obj), "entry"))) && (mnw == -1))
+               mnw = MIN_W_ENTRY;
+
              if (mnw != -1 && (w - cw) >= mnw)
                 ww = w - cw;
              else
@@ -1381,7 +1391,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
    if (part && strcmp(part, "default")) return;
    if (!label) return;
    item = (Elm_Multibuttonentry_Item *)it;
-   edje_object_part_text_set(item->button, "elm.btn.text", label);
+   edje_object_part_text_escaped_set(item->button, "elm.btn.text", label);
    _resize_button(item->button, &item->rw, &item->vw);
 }
 
@@ -1490,7 +1500,6 @@ elm_multibuttonentry_expanded_get(const Evas_Object *obj)
 
    if (!wd) return -1;
      return (wd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK ? EINA_FALSE : EINA_TRUE);
-
 }
 
 EAPI void
@@ -1566,7 +1575,7 @@ elm_multibuttonentry_selected_item_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   return eina_list_data_get(wd->current);
+   return wd->selected_it;
 }
 
 EAPI void
@@ -1604,7 +1613,7 @@ elm_multibuttonentry_clear(Evas_Object *obj)
           }
         wd->items = NULL;
      }
-   wd->current = NULL;
+   wd->selected_it = NULL;
    _view_update(obj);
 }
 
@@ -1653,13 +1662,13 @@ elm_multibuttonentry_item_next_get(const Elm_Object_Item *it)
    return NULL;
 }
 
-EAPI void *
+EINA_DEPRECATED EAPI void *
 elm_multibuttonentry_item_data_get(const Elm_Object_Item *it)
 {
    return elm_widget_item_data_get(it);
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_multibuttonentry_item_data_set(Elm_Object_Item *it, void *data)
 {
    return elm_widget_item_data_set(it, data);