get rid of carousel - empty junk we dont need.
SVN revision: 54354
This commit is contained in:
parent
e7b5941a4b
commit
ba1745c1db
|
@ -50,7 +50,6 @@ test_anchorblock.c \
|
|||
test_toolbar.c \
|
||||
test_hoversel.c \
|
||||
test_list.c \
|
||||
test_carousel.c \
|
||||
test_inwin.c \
|
||||
test_scaling.c \
|
||||
test_slider.c \
|
||||
|
|
|
@ -52,7 +52,6 @@ void test_list2(void *data, Evas_Object *obj, void *event_info);
|
|||
void test_list3(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_list4(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_list5(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_carousel(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_inwin(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_inwin2(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_scaling(void *data, Evas_Object *obj, void *event_info);
|
||||
|
@ -285,7 +284,6 @@ my_win_main(char *autorun)
|
|||
ADD_TEST("List 3", test_list3);
|
||||
ADD_TEST("List 4", test_list4);
|
||||
ADD_TEST("List 5", test_list5);
|
||||
ADD_TEST("Carousel", test_carousel);
|
||||
ADD_TEST("Inwin", test_inwin);
|
||||
ADD_TEST("Inwin 2", test_inwin2);
|
||||
ADD_TEST("Scaling", test_scaling);
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
#include <Elementary.h>
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "elementary_config.h"
|
||||
#endif
|
||||
#ifndef ELM_LIB_QUICKLAUNCH
|
||||
void
|
||||
test_carousel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *win, *bg, *car;
|
||||
|
||||
win = elm_win_add(NULL, "carousel", ELM_WIN_BASIC);
|
||||
elm_win_title_set(win, "Carousel");
|
||||
elm_win_autodel_set(win, 1);
|
||||
|
||||
bg = elm_bg_add(win);
|
||||
elm_win_resize_object_add(win, bg);
|
||||
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(bg);
|
||||
|
||||
car = elm_carousel_add(win);
|
||||
elm_win_resize_object_add(win, car);
|
||||
evas_object_size_hint_weight_set(car, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
elm_carousel_item_add(car, NULL, "Item 1", NULL, NULL);
|
||||
elm_carousel_item_add(car, NULL, "Item 2", NULL, NULL);
|
||||
elm_carousel_item_add(car, NULL, "Tinga", NULL, NULL);
|
||||
elm_carousel_item_add(car, NULL, "Item 4", NULL, NULL);
|
||||
evas_object_show(car);
|
||||
|
||||
evas_object_resize(win, 320, 240);
|
||||
evas_object_show(win);
|
||||
}
|
||||
#endif
|
|
@ -1508,19 +1508,6 @@ extern "C" {
|
|||
* "longpressed" - an item in the hoversel list is long-pressed
|
||||
*/
|
||||
|
||||
// FIXME: incomplete - carousel. don't use this until this comment is removed
|
||||
typedef struct _Elm_Carousel_Item Elm_Carousel_Item; /**< Item of Elm_Carousel. Sub-type of Elm_Widget_Item */
|
||||
EAPI Evas_Object *elm_carousel_add(Evas_Object *parent);
|
||||
EAPI Elm_Carousel_Item *elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data);
|
||||
EAPI void elm_carousel_item_del(Elm_Carousel_Item *item);
|
||||
|
||||
EAPI void elm_carousel_item_select(Elm_Carousel_Item *item);
|
||||
EAPI void elm_carousel_item_del_cb_set(Elm_Carousel_Item *it, Evas_Smart_Cb func);
|
||||
EAPI void *elm_carousel_item_data_get(const Elm_Carousel_Item *it);
|
||||
/* smart callbacks called:
|
||||
* "clicked" - when the user clicks on a carousel item and becomes selected
|
||||
*/
|
||||
|
||||
/* slider */
|
||||
EAPI Evas_Object *elm_slider_add(Evas_Object *parent);
|
||||
EAPI void elm_slider_label_set(Evas_Object *obj, const char *label);
|
||||
|
|
|
@ -58,7 +58,6 @@ elm_bubble.c \
|
|||
elm_photo.c \
|
||||
elm_toolbar.c \
|
||||
elm_list.c \
|
||||
elm_carousel.c \
|
||||
elm_slider.c \
|
||||
elm_magnetslider.c \
|
||||
elm_genlist.c \
|
||||
|
|
|
@ -1,287 +0,0 @@
|
|||
#include <Elementary.h>
|
||||
#include "elm_priv.h"
|
||||
|
||||
// FIXME: this is NOT the carousel - yet!
|
||||
|
||||
typedef struct _Widget_Data Widget_Data;
|
||||
|
||||
struct _Widget_Data
|
||||
{
|
||||
Evas_Object *scr, *bx;
|
||||
Eina_List *items;
|
||||
int icon_size;
|
||||
};
|
||||
|
||||
struct _Elm_Carousel_Item
|
||||
{
|
||||
Elm_Widget_Item base;
|
||||
Evas_Object *icon;
|
||||
const char *label;
|
||||
Evas_Smart_Cb func;
|
||||
Eina_Bool selected : 1;
|
||||
};
|
||||
|
||||
static const char *widtype = NULL;
|
||||
static void _del_hook(Evas_Object *obj);
|
||||
static void _theme_hook(Evas_Object *obj);
|
||||
static void _sizing_eval(Evas_Object *obj);
|
||||
|
||||
static void
|
||||
_item_show(Elm_Carousel_Item *it)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(it->base.widget);
|
||||
Evas_Coord x, y, w, h, bx, by;
|
||||
if (!wd) return;
|
||||
evas_object_geometry_get(wd->bx, &bx, &by, NULL, NULL);
|
||||
evas_object_geometry_get(it->base.view, &x, &y, &w, &h);
|
||||
elm_smart_scroller_child_region_show(wd->scr, x - bx, y - by, w, h);
|
||||
}
|
||||
|
||||
static void
|
||||
_item_select(Elm_Carousel_Item *it)
|
||||
{
|
||||
Elm_Carousel_Item *it2;
|
||||
Widget_Data *wd = elm_widget_data_get(it->base.widget);
|
||||
Evas_Object *obj2;
|
||||
const Eina_List *l;
|
||||
if (!wd) return;
|
||||
if (it->selected) return;
|
||||
EINA_LIST_FOREACH(wd->items, l, it2)
|
||||
{
|
||||
if (it2->selected)
|
||||
{
|
||||
it2->selected = EINA_FALSE;
|
||||
edje_object_signal_emit(it2->base.view, "elm,state,unselected", "elm");
|
||||
break;
|
||||
}
|
||||
}
|
||||
it->selected = EINA_TRUE;
|
||||
edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
|
||||
_item_show(it);
|
||||
obj2 = it->base.widget;
|
||||
if (it->func) it->func((void *)(it->base.data), it->base.widget, it);
|
||||
evas_object_smart_callback_call(obj2, "clicked", it);
|
||||
}
|
||||
|
||||
static void
|
||||
_del_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
free(wd);
|
||||
}
|
||||
|
||||
static void
|
||||
_theme_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
const Eina_List *l;
|
||||
const Elm_Carousel_Item *it;
|
||||
if (!wd) return;
|
||||
EINA_LIST_FOREACH(wd->items, l, it)
|
||||
{
|
||||
Evas_Coord mw, mh;
|
||||
|
||||
if (it->selected)
|
||||
edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
|
||||
_elm_theme_object_set(obj, it->base.view, "carousel", "item", elm_widget_style_get(obj));
|
||||
edje_object_scale_set(it->base.view, elm_widget_scale_get(obj) * _elm_config->scale);
|
||||
if (it->icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(it->icon,
|
||||
(double)wd->icon_size * _elm_config->scale,
|
||||
(double)wd->icon_size * _elm_config->scale);
|
||||
edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
|
||||
}
|
||||
edje_object_part_text_set(it->base.view, "elm.text", it->label);
|
||||
edje_object_size_min_calc(it->base.view, &mw, &mh);
|
||||
evas_object_size_hint_min_set(it->base.view, mw, mh);
|
||||
evas_object_size_hint_max_set(it->base.view, 9999, mh);
|
||||
}
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
||||
static void
|
||||
_sizing_eval(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
|
||||
Evas_Coord vw = 0, vh = 0;
|
||||
if (!wd) return;
|
||||
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh);
|
||||
evas_object_resize(wd->scr, 500, 500);
|
||||
evas_object_size_hint_min_get(wd->bx, &minw, &minh);
|
||||
evas_object_resize(wd->bx, minw, minh);
|
||||
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
|
||||
minw = minw + (500 - vw);
|
||||
minh = minh + (500 - vh);
|
||||
evas_object_size_hint_min_set(obj, minw, minh);
|
||||
evas_object_size_hint_max_set(obj, maxw, maxh);
|
||||
}
|
||||
|
||||
static void
|
||||
_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(data);
|
||||
Evas_Coord mw, mh, vw, vh, w, h;
|
||||
const Eina_List *l;
|
||||
Elm_Carousel_Item *it;
|
||||
if (!wd) return;
|
||||
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
|
||||
evas_object_size_hint_min_get(wd->bx, &mw, &mh);
|
||||
evas_object_geometry_get(wd->bx, NULL, NULL, &w, &h);
|
||||
if (vw >= mw)
|
||||
{
|
||||
if (w != vw) evas_object_resize(wd->bx, vw, h);
|
||||
}
|
||||
EINA_LIST_FOREACH(wd->items, l, it)
|
||||
{
|
||||
if (it->selected)
|
||||
{
|
||||
_item_show(it);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
_select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
_item_select(data);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_carousel_add(Evas_Object *parent)
|
||||
{
|
||||
Evas_Object *obj;
|
||||
Evas *e;
|
||||
Widget_Data *wd;
|
||||
|
||||
wd = ELM_NEW(Widget_Data);
|
||||
e = evas_object_evas_get(parent);
|
||||
obj = elm_widget_add(e);
|
||||
ELM_SET_WIDTYPE(widtype, "carousel");
|
||||
elm_widget_type_set(obj, "carousel");
|
||||
elm_widget_sub_object_add(parent, obj);
|
||||
elm_widget_data_set(obj, wd);
|
||||
elm_widget_del_hook_set(obj, _del_hook);
|
||||
elm_widget_theme_hook_set(obj, _theme_hook);
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
wd->scr = elm_smart_scroller_add(e);
|
||||
elm_smart_scroller_widget_set(wd->scr, obj);
|
||||
elm_smart_scroller_object_theme_set(obj, wd->scr, "carousel", "base", "default");
|
||||
elm_widget_resize_object_set(obj, wd->scr);
|
||||
elm_smart_scroller_policy_set(wd->scr,
|
||||
ELM_SMART_SCROLLER_POLICY_AUTO,
|
||||
ELM_SMART_SCROLLER_POLICY_OFF);
|
||||
|
||||
wd->icon_size = _elm_config->icon_size;
|
||||
|
||||
wd->bx = evas_object_box_add(e);
|
||||
evas_object_box_layout_set(wd->bx,
|
||||
evas_object_box_layout_homogeneous_horizontal, NULL, NULL);
|
||||
elm_widget_sub_object_add(obj, wd->bx);
|
||||
elm_smart_scroller_child_set(wd->scr, wd->bx);
|
||||
evas_object_show(wd->bx);
|
||||
|
||||
evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE,
|
||||
_resize, obj);
|
||||
|
||||
_sizing_eval(obj);
|
||||
return obj;
|
||||
}
|
||||
|
||||
EAPI Elm_Carousel_Item *
|
||||
elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data)
|
||||
{
|
||||
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return NULL;
|
||||
Evas_Coord mw, mh;
|
||||
Elm_Carousel_Item *it = elm_widget_item_new(obj, Elm_Carousel_Item);
|
||||
|
||||
if (!it) return NULL;
|
||||
wd->items = eina_list_append(wd->items, it);
|
||||
it->label = eina_stringshare_add(label);
|
||||
it->icon = icon;
|
||||
it->func = func;
|
||||
it->base.data = data;
|
||||
it->base.view = edje_object_add(evas_object_evas_get(obj));
|
||||
_elm_theme_object_set(obj, it->base.view, "carousel", "item", elm_widget_style_get(obj));
|
||||
edje_object_signal_callback_add(it->base.view, "elm,action,click", "elm",
|
||||
_select, it);
|
||||
elm_widget_sub_object_add(obj, it->base.view);
|
||||
if (it->icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(it->icon,
|
||||
(double)wd->icon_size * _elm_config->scale,
|
||||
(double)wd->icon_size * _elm_config->scale);
|
||||
edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
|
||||
evas_object_show(it->icon);
|
||||
elm_widget_sub_object_add(obj, it->icon);
|
||||
}
|
||||
edje_object_part_text_set(it->base.view, "elm.text", it->label);
|
||||
edje_object_size_min_calc(it->base.view, &mw, &mh);
|
||||
evas_object_size_hint_weight_set(it->base.view, 0.0, 0.0);
|
||||
evas_object_size_hint_align_set(it->base.view, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_size_hint_min_set(it->base.view, mw, mh);
|
||||
evas_object_size_hint_max_set(it->base.view, 9999, mh);
|
||||
evas_object_box_append(wd->bx, it->base.view);
|
||||
evas_object_show(it->base.view);
|
||||
_sizing_eval(obj);
|
||||
return it;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
elm_carousel_item_del(Elm_Carousel_Item *it)
|
||||
{
|
||||
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
|
||||
Widget_Data *wd = elm_widget_data_get(it->base.widget);
|
||||
Evas_Object *obj2 = it->base.widget;
|
||||
if (!wd) return;
|
||||
wd->items = eina_list_remove(wd->items, it);
|
||||
eina_stringshare_del(it->label);
|
||||
if (it->icon) evas_object_del(it->icon);
|
||||
evas_object_del(it->base.view);
|
||||
free(it);
|
||||
_theme_hook(obj2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the function called when a carousel item is freed.
|
||||
*
|
||||
* @param it The item to set the callback on
|
||||
* @param func The function called
|
||||
*
|
||||
* @ingroup Carousel
|
||||
*/
|
||||
EAPI void
|
||||
elm_carousel_item_del_cb_set(Elm_Carousel_Item *it, Evas_Smart_Cb func)
|
||||
{
|
||||
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
|
||||
elm_widget_item_del_cb_set(it, func);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the data associated with the item.
|
||||
*
|
||||
* @param it The carousel item
|
||||
* @return The data associated with @p it
|
||||
*
|
||||
* @ingroup Carousel
|
||||
*/
|
||||
EAPI void *
|
||||
elm_carousel_item_data_get(const Elm_Carousel_Item *it)
|
||||
{
|
||||
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
|
||||
return elm_widget_item_data_get(it);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
elm_carousel_item_select(Elm_Carousel_Item *it)
|
||||
{
|
||||
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
|
||||
_item_select(it);
|
||||
}
|
Loading…
Reference in New Issue