enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

[Elementary] Implement get/unset for icon/end properties of scrolled_entry. 

(Suggestion by glima)


SVN revision: 52603
This commit is contained in:
Leandro Pereira 2010-09-22 19:15:38 +00:00
parent 8c7e3016e1
commit 51f9a38521
2 changed files with 93 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/src/lib/Elementary.h.in
View File

@ -1675,8 +1675,12 @@ extern "C" {
EAPI void elm_scrolled_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
EAPI void elm_scrolled_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
EAPI void elm_scrolled_entry_icon_set(Evas_Object *obj, Evas_Object *icon);
EAPI const Evas_Object *elm_scrolled_entry_icon_get(Evas_Object *obj);
EAPI Evas_Object *elm_scrolled_entry_icon_unset(Evas_Object *obj);
EAPI void elm_scrolled_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting);
EAPI void elm_scrolled_entry_end_set(Evas_Object *obj, Evas_Object *end);
EAPI const Evas_Object *elm_scrolled_entry_end_get(Evas_Object *obj);
EAPI Evas_Object *elm_scrolled_entry_end_unset(Evas_Object *obj);
EAPI void elm_scrolled_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting);
EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);

108
legacy/elementary/src/lib/elc_scrolled_entry.c
View File

@ -338,9 +338,7 @@ elm_scrolled_entry_add(Evas_Object *parent)
*
* @param obj The scrolled entry object
* @param left_obj The widget to display on the left side of the scrolled entry.
* If it is NULL, and there is already an widget on the left-side, it will be destroyed.
* If it isn't NULL, and there were another widget on the left-side already, the old
* widget will be destroyed.
* The old widget will be destroyed.
*
* @ingroup Scrolled_Entry
* @see elm_scrolled_entry_end_set
@ -350,16 +348,53 @@ elm_scrolled_entry_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) return;
if (wd->icon) evas_object_del(wd->icon);
if (icon)
{
wd->icon = icon;
elm_box_pack_before(wd->box, wd->icon, wd->scroller);
}
wd->icon = icon;
elm_box_pack_before(wd->box, wd->icon, wd->scroller);
_sizing_eval(obj);
}
/**
* Gets the leftmost widget of the scrolled entry. This object is owned by the scrolled
* entry and should not be modified.
*
* @param obj The scrolled entry object
*
* @ingroup Scrolled_Entry
*/
EAPI const Evas_Object *
elm_scrolled_entry_icon_get(Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
return wd->icon;
}
/**
* Unsets the leftmost widget of the scrolled entry. Unparents and return the leftmost widget.
*
* @param obj The scrolled entry object
*
* @ingroup Scrolled_Entry
*/
EAPI Evas_Object *
elm_scrolled_entry_icon_unset(Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *ret = NULL;
if (!wd) return NULL;
if (wd->icon)
{
ret = wd->icon;
elm_box_unpack(wd->box, wd->icon);
_sizing_eval(obj);
}
return ret;
}
/**
* Sets the visibility of the left-side widget of the scrolled entry, set by
* @elm_scrolled_entry_icon_set().
@ -386,10 +421,8 @@ elm_scrolled_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting)
* This sets a widget to be displayed to the end of a scrolled entry.
*
* @param obj The scrolled entry object
* @param left_obj The widget to display on the right side of the scrolled entry.
* If it is NULL, and there is already an widget on the right-side, it will be destroyed.
* If it isn't NULL, and there were another widget on the right-side already, the old
* widget will be destroyed.
* @param end The widget to display on the right side of the scrolled entry.
* The old widget will be destroyed.
*
* @ingroup Scrolled_Entry
* @see elm_scrolled_entry_icon_set
@ -399,16 +432,53 @@ elm_scrolled_entry_end_set(Evas_Object *obj, Evas_Object *end)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (!wd || !end) return;
if (wd->end) evas_object_del(wd->end);
if (end)
{
wd->end = end;
elm_box_pack_after(wd->box, wd->end, wd->scroller);
}
wd->end = end;
elm_box_pack_after(wd->box, wd->end, wd->scroller);
_sizing_eval(obj);
}
/**
* Gets the endmost widget of the scrolled entry. This object is owned by the scrolled
* entry and should not be modified.
*
* @param obj The scrolled entry object
*
* @ingroup Scrolled_Entry
*/
EAPI const Evas_Object *
elm_scrolled_entry_end_get(Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
return wd->end;
}
/**
* Unsets the endmost widget of the scrolled entry. Unparents and return the endmost widget.
*
* @param obj The scrolled entry object
*
* @ingroup Scrolled_Entry
*/
EAPI Evas_Object *
elm_scrolled_entry_end_unset(Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *ret = NULL;
if (!wd) return NULL;
if (wd->end)
{
ret = wd->end;
elm_box_unpack(wd->box, wd->end);
_sizing_eval(obj);
}
return ret;
}
/**
* Sets the visibility of the end widget of the scrolled entry, set by
* @elm_scrolled_entry_end_set().