enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

radio widget working. 

SVN revision: 39173
This commit is contained in:
Carsten Haitzler 2009-02-24 09:23:51 +00:00
parent 5a806c775b
commit 7e31e6d212
11 changed files with 541 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/data/themes/Makefile.am
View File

@ -114,7 +114,10 @@ slv_bg_over.png \
slv_units.png \
check_base.png \
check.png \
check2.png
check2.png \
radio_base.png \
radio.png \
radio2.png
default.edj: Makefile $(EXTRA_DIST)
$(EDJE_CC) $(EDJE_FLAGS) \

144
legacy/elementary/data/themes/default.edc
View File

@ -1240,7 +1240,7 @@ collections {
part { name: "elm.swallow.content";
type: SWALLOW;
description { state: "default" 0.0;
// fixed: 1 1;
fixed: 1 0;
visible: 0;
align: 0.0 0.5;
rel1.offset: 4 4;
@ -1249,7 +1249,7 @@ collections {
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
// fixed: 0 0;
fixed: 1 1;
visible: 1;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
@ -7587,7 +7587,7 @@ collections {
part { name: "elm.swallow.content";
type: SWALLOW;
description { state: "default" 0.0;
// fixed: 1 1;
fixed: 1 0;
visible: 0;
align: 0.0 0.5;
rel1.to_x: "bg";
@ -7599,7 +7599,7 @@ collections {
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
// fixed: 0 0;
fixed: 1 1;
visible: 1;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
@ -7682,4 +7682,140 @@ collections {
}
}
}
///////////////////////////////////////////////////////////////////////////////
group { name: "elm/radio/base/default";
images {
image: "radio_base.png" COMP;
image: "radio.png" COMP;
image: "radio2.png" COMP;
}
parts {
part { name: "bg";
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 1 1;
rel2.relative: 0.0 1.0;
rel2.offset: 1 -2;
align: 0.0 0.5;
min: 16 16;
max: 16 16;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
image.normal: "radio_base.png";
}
}
part { name: "radio";
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
visible: 0;
image.normal: "radio.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part { name: "elm.swallow.content";
type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 0;
visible: 0;
align: 0.0 0.5;
rel1.to_x: "bg";
rel1.relative: 1.0 0.0;
rel1.offset: 1 1;
rel2.to_x: "bg";
rel2.relative: 1.0 1.0;
rel2.offset: 2 -2;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
fixed: 1 1;
visible: 1;
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
}
}
part { name: "elm.text";
type: TEXT;
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
rel1.to_x: "elm.swallow.content";
rel1.relative: 1.0 0.0;
rel1.offset: 1 1;
rel2.relative: 1.0 1.0;
rel2.offset: -2 -2;
color: 0 0 0 255;
text {
font: "Sans,Edje-Vera";
size: 10;
min: 0 0;
align: 0.0 0.5;
}
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
text.min: 1 1;
}
}
part { name: "events";
type: RECT;
ignore_flags: ON_HOLD;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
}
programs {
program { name: "click";
signal: "mouse,up,1";
source: "events";
action: SIGNAL_EMIT "elm,action,radio,toggle" "";
}
program { name: "radio_on";
signal: "elm,state,radio,on";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "radio";
}
program { name: "radio_off";
signal: "elm,state,radio,off";
source: "elm";
action: STATE_SET "default" 0.0;
target: "radio";
}
program { name: "text_show";
signal: "elm,state,text,visible";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.text";
}
program { name: "text_hide";
signal: "elm,state,text,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text";
}
program { name: "icon_show";
signal: "elm,state,icon,visible";
source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.content";
}
program { name: "icon_hide";
signal: "elm,state,icon,hidden";
source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.content";
}
}
}
}

BIN
legacy/elementary/data/themes/radio.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
legacy/elementary/data/themes/radio2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
legacy/elementary/data/themes/radio_base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

117
legacy/elementary/src/bin/test.c
View File

@ -2460,7 +2460,7 @@ my_bt_31(void *data, Evas_Object *obj, void *event_info)
static void
my_bt_32(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *ic, *tg;
Evas_Object *win, *bg, *bx, *ic, *ck;
char buf[PATH_MAX];
win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
@ -2481,45 +2481,117 @@ my_bt_32(void *data, Evas_Object *obj, void *event_info)
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
tg = elm_check_add(win);
evas_object_size_hint_weight_set(tg, 1.0, 1.0);
evas_object_size_hint_align_set(tg, -1.0, 0.5);
elm_check_label_set(tg, "Icon sized to check");
elm_check_icon_set(tg, ic);
elm_check_state_set(tg, 1);
elm_box_pack_end(bx, tg);
evas_object_show(tg);
ck = elm_check_add(win);
evas_object_size_hint_weight_set(ck, 1.0, 1.0);
evas_object_size_hint_align_set(ck, -1.0, 0.5);
elm_check_label_set(ck, "Icon sized to check");
elm_check_icon_set(ck, ic);
elm_check_state_set(ck, 1);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
evas_object_show(ic);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
tg = elm_check_add(win);
elm_check_label_set(tg, "Icon no scale");
elm_check_icon_set(tg, ic);
elm_box_pack_end(bx, tg);
evas_object_show(tg);
ck = elm_check_add(win);
elm_check_label_set(ck, "Icon no scale");
elm_check_icon_set(ck, ic);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
evas_object_show(ic);
tg = elm_check_add(win);
elm_check_label_set(tg, "Label Only");
elm_box_pack_end(bx, tg);
evas_object_show(tg);
ck = elm_check_add(win);
elm_check_label_set(ck, "Label Only");
elm_box_pack_end(bx, ck);
evas_object_show(ck);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
tg = elm_check_add(win);
elm_check_icon_set(tg, ic);
elm_box_pack_end(bx, tg);
evas_object_show(tg);
ck = elm_check_add(win);
elm_check_icon_set(ck, ic);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
evas_object_show(ic);
evas_object_show(win);
}
static void
my_bt_33(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *ic, *rd, *rdg;
char buf[PATH_MAX];
win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
elm_win_title_set(win, "Radios");
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, 1.0, 1.0);
evas_object_show(bg);
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
elm_win_resize_object_add(win, bx);
evas_object_show(bx);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 0);
evas_object_size_hint_weight_set(rd, 1.0, 1.0);
evas_object_size_hint_align_set(rd, -1.0, 0.5);
elm_radio_label_set(rd, "Icon sized to radio");
elm_radio_icon_set(rd, ic);
elm_box_pack_end(bx, rd);
evas_object_show(rd);
evas_object_show(ic);
rdg = rd;
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 1);
elm_radio_group_add(rd, rdg);
elm_radio_label_set(rd, "Icon no scale");
elm_radio_icon_set(rd, ic);
elm_box_pack_end(bx, rd);
evas_object_show(rd);
evas_object_show(ic);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 2);
elm_radio_group_add(rd, rdg);
elm_radio_label_set(rd, "Label Only");
elm_box_pack_end(bx, rd);
evas_object_show(rd);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 3);
elm_radio_group_add(rd, rdg);
elm_radio_icon_set(rd, ic);
elm_box_pack_end(bx, rd);
evas_object_show(rd);
evas_object_show(ic);
elm_radio_value_set(rdg, 2);
evas_object_show(win);
}
static void
my_win_main(void)
{
@ -2627,6 +2699,7 @@ my_win_main(void)
elm_list_item_append(li, "Genlist 2", NULL, NULL, my_bt_30, NULL);
elm_list_item_append(li, "Genlist 3", NULL, NULL, my_bt_31, NULL);
elm_list_item_append(li, "Checks", NULL, NULL, my_bt_32, NULL);
elm_list_item_append(li, "Radios", NULL, NULL, my_bt_33, NULL);
elm_list_go(li);

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

@ -556,6 +556,18 @@ extern "C" {
* "changed" - the user toggled the state
*/
EAPI Evas_Object *elm_radio_add(Evas_Object *parent);
EAPI void elm_radio_label_set(Evas_Object *obj, const char *label);
EAPI void elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon);
EAPI void elm_radio_group_add(Evas_Object *obj, Evas_Object *group);
EAPI void elm_radio_state_value_set(Evas_Object *obj, int value);
EAPI void elm_radio_value_set(Evas_Object *obj, int value);
EAPI int elm_radio_value_get(Evas_Object *obj);
EAPI void elm_radio_value_pointer_set(Evas_Object *obj, int *valuep);
/* smart callbacks called:
* "changed" - the user toggled the state
*/
#ifdef __cplusplus
}
#endif
@ -581,8 +593,6 @@ extern "C" {
//
//// (more widgets/features - medium priority)
// * tree feature for genlist widget (like biglist - but items can expand to sub-items)
// * radio + group handling
// * checkbox (like toggle)
// * pager (for pushing/popping pages and going back and forward and flipping)
// * <edje copy & paste fixed>
// * <evas scale cache>

1
legacy/elementary/src/lib/Makefile.am
View File

@ -50,6 +50,7 @@ elm_carousel.c \
elm_slider.c \
elm_genlist.c \
elm_check.c \
elm_radio.c \
\
elc_notepad.c \
elc_anchorview.c \

5
legacy/elementary/src/lib/elm_check.c
View File

@ -19,6 +19,7 @@ static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *eve
static void _sub_del(void *data, Evas_Object *obj, void *event_info);
static void _signal_check_off(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _signal_check_on(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _signal_check_toggle(void *data, Evas_Object *obj, const char *emission, const char *source);
static void
_del_hook(Evas_Object *obj)
@ -230,4 +231,8 @@ elm_check_state_pointer_set(Evas_Object *obj, Evas_Bool *statep)
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
}
}
else
{
wd->statep = NULL;
}
}

280
legacy/elementary/src/lib/elm_radio.c Normal file
View File

@ -0,0 +1,280 @@
#include <Elementary.h>
#include "elm_priv.h"
typedef struct _Widget_Data Widget_Data;
typedef struct _Group Group;
struct _Group
{
int value;
int *valuep;
Eina_List *radios;
};
struct _Widget_Data
{
Evas_Object *chk;
Evas_Object *icon;
int value;
const char *label;
Evas_Bool state;
Group *group;
};
static void _del_hook(Evas_Object *obj);
static void _theme_hook(Evas_Object *obj);
static void _sizing_eval(Evas_Object *obj);
static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _sub_del(void *data, Evas_Object *obj, void *event_info);
static void _signal_radio_on(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _signal_radio_toggle(void *data, Evas_Object *obj, const char *emission, const char *source);
static void
_del_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (wd->label) eina_stringshare_del(wd->label);
wd->group->radios = eina_list_remove(wd->group->radios, obj);
if (!wd->group->radios) free(wd->group);
wd->group = NULL;
free(wd);
}
static void
_theme_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
_elm_theme_set(wd->chk, "radio", "base", "default");
if (wd->icon)
edje_object_signal_emit(wd->chk, "elm,state,icon,visible", "elm");
else
edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm");
if (wd->state)
edje_object_signal_emit(wd->chk, "elm,state,radio,on", "elm");
else
edje_object_signal_emit(wd->chk, "elm,state,radio,off", "elm");
if (wd->label)
edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm");
else
edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
edje_object_part_text_set(wd->chk, "elm.text", wd->label);
edje_object_message_signal_process(wd->chk);
edje_object_scale_set(wd->chk, elm_widget_scale_get(obj) * _elm_config->scale);
_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;
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
edje_object_size_min_restricted_calc(wd->chk, &minw, &minh, minw, minh);
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, maxw, maxh);
}
static void
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
if (obj != wd->icon) return;
edje_object_part_swallow(wd->chk, "elm.swallow.content", obj);
Evas_Coord mw, mh;
evas_object_size_hint_min_get(obj, &mw, &mh);
_sizing_eval(data);
}
static void
_sub_del(void *data, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *sub = event_info;
if (sub == wd->icon)
{
edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints);
wd->icon = NULL;
_sizing_eval(obj);
}
}
static void
_state_set(Evas_Object *obj, Evas_Bool state)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (state != wd->state)
{
wd->state = state;
if (wd->state)
edje_object_signal_emit(wd->chk, "elm,state,radio,on", "elm");
else
edje_object_signal_emit(wd->chk, "elm,state,radio,off", "elm");
}
}
static void
_signal_radio_on(void *data, Evas_Object *obj, const char *emission, const char *source)
{
Widget_Data *wd = elm_widget_data_get(data);
Eina_List *l;
if (wd->group->value == wd->value) return;
wd->group->value = wd->value;
if (wd->group->valuep) *(wd->group->valuep) = wd->group->value;
for (l = wd->group->radios; l; l = l->next)
{
Widget_Data *wd2 = elm_widget_data_get(l->data);
if (wd2->value == wd->group->value) _state_set(l->data, 1);
else _state_set(l->data, 0);
}
evas_object_smart_callback_call(data, "changed", NULL);
}
EAPI Evas_Object *
elm_radio_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_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
wd->chk = edje_object_add(e);
_elm_theme_set(wd->chk, "radio", "base", "default");
edje_object_signal_callback_add(wd->chk, "elm,action,radio,on", "", _signal_radio_on, obj);
edje_object_signal_callback_add(wd->chk, "elm,action,radio,toggle", "", _signal_radio_on, obj);
elm_widget_resize_object_set(obj, wd->chk);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
wd->group = calloc(1, sizeof(Group));
wd->group->radios = eina_list_append(wd->group->radios, obj);
wd->state = 0;
_sizing_eval(obj);
return obj;
}
EAPI void
elm_radio_label_set(Evas_Object *obj, const char *label)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Coord mw, mh;
if (wd->label) eina_stringshare_del(wd->label);
if (label)
{
wd->label = eina_stringshare_add(label);
edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->chk);
}
else
{
wd->label = NULL;
edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->chk);
}
edje_object_part_text_set(wd->chk, "elm.text", label);
_sizing_eval(obj);
}
EAPI void
elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon)
{
Widget_Data *wd = elm_widget_data_get(obj);
if ((wd->icon != icon) && (wd->icon))
elm_widget_sub_object_del(obj, wd->icon);
wd->icon = icon;
if (icon)
{
elm_widget_sub_object_add(obj, icon);
edje_object_part_swallow(wd->chk, "elm.swallow.content", icon);
edje_object_signal_emit(wd->chk, "elm,state,icon,visible", "elm");
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
_sizing_eval(obj);
}
}
EAPI void
elm_radio_group_add(Evas_Object *obj, Evas_Object *group)
{
Widget_Data *wd = elm_widget_data_get(obj);
Widget_Data *wd2 = elm_widget_data_get(group);
Evas_Bool state = 0;
if (wd->group == wd2->group) return;
wd->group->radios = eina_list_remove(wd->group->radios, obj);
if (!wd->group->radios) free(wd->group);
wd->group = wd2->group;
wd->group->radios = eina_list_append(wd->group->radios, obj);
if (wd->value == wd->group->value) _state_set(obj, 1);
else _state_set(obj, 0);
}
EAPI void
elm_radio_state_value_set(Evas_Object *obj, int value)
{
Widget_Data *wd = elm_widget_data_get(obj);
// if (wd->value == value) return;
wd->value = value;
if (wd->value == wd->group->value) _state_set(obj, 1);
else _state_set(obj, 0);
}
EAPI void
elm_radio_value_set(Evas_Object *obj, int value)
{
Widget_Data *wd = elm_widget_data_get(obj);
Eina_List *l;
if (value == wd->group->value) return;
wd->group->value = value;
if (wd->group->valuep) *(wd->group->valuep) = wd->group->value;
for (l = wd->group->radios; l; l = l->next)
{
Widget_Data *wd2 = elm_widget_data_get(l->data);
if (wd2->value == wd->group->value) _state_set(l->data, 1);
else _state_set(l->data, 0);
}
}
EAPI int
elm_radio_value_get(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
return wd->group->value;
}
EAPI void
elm_radio_value_pointer_set(Evas_Object *obj, int *valuep)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (valuep)
{
wd->group->valuep = valuep;
if (*(wd->group->valuep) != wd->group->value)
{
Eina_List *l;
wd->group->value = *(wd->group->valuep);
for (l = wd->group->radios; l; l = l->next)
{
Widget_Data *wd2 = elm_widget_data_get(l->data);
if (wd2->value == wd->group->value) _state_set(l->data, 1);
else _state_set(l->data, 0);
}
}
}
else
{
wd->group->valuep = NULL;
}
}

4
legacy/elementary/src/lib/elm_toggle.c
View File

@ -238,4 +238,8 @@ elm_toggle_state_pointer_set(Evas_Object *obj, Evas_Bool *statep)
edje_object_signal_emit(wd->tgl, "elm,state,toggle,off", "elm");
}
}
else
{
wd->statep = NULL;
}
}