[elm_bubble]EFL merge

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
old mode 100644 (file)
new mode 100755 (executable)
index 5d112b0..2de3ef4
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -922,6 +922,7 @@ extern "C" {
    EAPI const char  *elm_bubble_info_get(const Evas_Object *obj);
 
    EAPI void         elm_bubble_content_set(Evas_Object *obj, Evas_Object *content);
+   EAPI Evas_Object *elm_bubble_content_unset(Evas_Object *obj);
    EAPI void         elm_bubble_icon_set(Evas_Object *obj, Evas_Object *icon);
    EAPI Evas_Object *elm_bubble_icon_get(const Evas_Object *obj);
    EAPI void         elm_bubble_corner_set(Evas_Object *obj, const char *corner);

diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index b50eb34..95df88e 100755 (executable)
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -75,8 +75,12 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
    evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _changed_size_hints, obj);
    if (sub == wd->content) wd->content = NULL;
-   else if (sub == wd->icon) wd->icon = NULL;
-
+   else if (sub == wd->icon)
+     {
+       edje_object_signal_emit(wd->bbl, "elm,state,icon,hidden", "elm");
+       wd->icon = NULL;
+       edje_object_message_signal_process(wd->bbl);
+     }
    _sizing_eval(obj);
 }
 
@@ -134,8 +138,8 @@ elm_bubble_label_set(Evas_Object *obj, const char *label)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if (label) edje_object_signal_emit(wd->bbl, "elm,state,label,add", "elm");
-   else edje_object_signal_emit(wd->bbl, "elm,state,label,add", "elm");
+   if (label) edje_object_signal_emit(wd->bbl, "elm,state,label,visible", "elm");
+   else edje_object_signal_emit(wd->bbl, "elm,state,label,hidden", "elm");
    eina_stringshare_replace(&wd->label, label);
    edje_object_part_text_set(wd->bbl, "elm.text", label);
    _sizing_eval(obj);
@@ -208,13 +212,17 @@ elm_bubble_info_get(const Evas_Object *obj)
 }
 
 /**
- * Set the text to be showed in the bubble
+ * Set the content to be shown in the bubble
+ *
+ * Once the content object is set, a previously set one will be deleted.
+ * If you want to keep the old content object, use the
+ * elm_bubble_content_unset() function.
  *
  * @param obj The bubble object
- * @param content The given info about the bubble
+ * @param content The given content of the bubble
  *
- * This function sets the text shown on the top right of bubble. In
- * the Anchorblock example of the Elementary tests application it
+ * This function sets the content shown on the middle of the bubble.
+ * In the Anchorblock example of the Elementary tests application it
  * shows time.
  *
  * @ingroup Bubble
@@ -225,14 +233,13 @@ elm_bubble_content_set(Evas_Object *obj, Evas_Object *content)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if ((wd->content != content) && (wd->content))
-     elm_widget_sub_object_del(obj, wd->content);
+   if (wd->content == content) return;
+   if (wd->content) evas_object_del(wd->content);
    wd->content = content;
    if (content)
      {
        elm_widget_sub_object_add(obj, content);
-       evas_object_event_callback_add(content,
-                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+       evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                       _changed_size_hints, obj);
        edje_object_part_swallow(wd->bbl, "elm.swallow.content", content);
      }
@@ -240,13 +247,38 @@ elm_bubble_content_set(Evas_Object *obj, Evas_Object *content)
 }
 
 /**
+ * Unset the content shown in the bubble
+ *
+ * Unparent and return the content object which was set for this widget.
+ *
+ * @param obj The bubble object
+ * @return The content that was being used
+ *
+ * @ingroup Bubble
+ */
+EAPI Evas_Object *
+elm_bubble_content_unset(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *content;
+   if (!wd) return NULL;
+   if (!wd->content) return NULL;
+   content = wd->content;
+   elm_widget_sub_object_del(obj, wd->content);
+   edje_object_part_unswallow(wd->bbl, wd->content);
+   wd->content = NULL;
+   return content;
+}
+
+/**
  * Set the icon of the bubble
  *
+ * Once the icon object is set, a previously set one will be deleted.
+ *
  * @param obj The bubble object
  * @param icon The given icon for the bubble
  *
- * This function sets the icon shown on the top left of bubble.
- *
  * @ingroup Bubble
  */
 EAPI void
@@ -255,18 +287,18 @@ elm_bubble_icon_set(Evas_Object *obj, Evas_Object *icon)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if ((wd->icon != icon) && (wd->icon))
-     elm_widget_sub_object_del(obj, wd->icon);
+   if (wd->icon == icon) return;
+   if (wd->icon) evas_object_del(wd->icon);
    wd->icon = icon;
    if (icon)
      {
        elm_widget_sub_object_add(obj, icon);
-       edje_object_signal_emit(wd->bbl, "elm,state,icon,add", "elm");
        edje_object_part_swallow(wd->bbl, "elm.swallow.icon", icon);
        evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                       _changed_size_hints, obj);
+       edje_object_signal_emit(wd->bbl, "elm,state,icon,visible", "elm");
+       edje_object_message_signal_process(wd->bbl);
      }
-   else edje_object_signal_emit(wd->bbl, "elm,state,icon,del", "elm");
    
    _sizing_eval(obj);
 }