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

and really move all toggle stuff over to check. 

SVN revision: 64231
This commit is contained in:
Carsten Haitzler 2011-10-21 04:36:25 +00:00
parent 1444302c29
commit 6c10a447b1
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/elementary/data/themes/widgets/toggle.edc
View File

@ -1,5 +1,4 @@
group { name: "elm/check/base/toggle";
alias: "elm/toggle/base/default";
images {
image: "shelf_inset.png" COMP;
image: "bt_basew.png" COMP;
@ -313,16 +312,16 @@ group { name: "elm/check/base/toggle";
}
if (((get_int(is_rtl) == 1) && (dx <= 0.5)) ||
(get_int(is_rtl) == 0) && (dx > 0.5)) {
emit("elm,action,toggle,on", "");
emit("elm,action,check,on", "");
}
else {
emit("elm,action,toggle,off", "");
emit("elm,action,check,off", "");
}
}
}
program { name: "toggle_on";
signal: "elm,state,toggle,on";
program { name: "check_on";
signal: "elm,state,check,on";
source: "elm";
script {
new Float:drag;
@ -335,8 +334,8 @@ group { name: "elm/check/base/toggle";
set_drag(PART:"button", drag, 0.0);
}
}
program { name: "toggle_off";
signal: "elm,state,toggle,off";
program { name: "check_off";
signal: "elm,state,check,off";
source: "elm";
script {
new Float:drag;

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

@ -101,15 +101,9 @@ _theme_hook(Evas_Object *obj)
else
edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm");
if (wd->state)
{
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
}
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
else
{
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
}
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
if (wd->label)
edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm");
else
@ -182,7 +176,6 @@ _signal_check_off(void *data, Evas_Object *obj __UNUSED__, const char *emission
wd->state = EINA_FALSE;
if (wd->statep) *wd->statep = wd->state;
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
}
@ -194,7 +187,6 @@ _signal_check_on(void *data, Evas_Object *obj __UNUSED__, const char *emission _
wd->state = EINA_TRUE;
if (wd->statep) *wd->statep = wd->state;
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
}
@ -466,15 +458,9 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
wd->state = state;
if (wd->statep) *wd->statep = wd->state;
if (wd->state)
{
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
}
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
else
{
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
}
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
}
edje_object_message_signal_process(wd->chk);
}
@ -501,15 +487,9 @@ elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep)
{
wd->state = *wd->statep;
if (wd->state)
{
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,on", "elm");
}
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
else
{
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
edje_object_signal_emit(wd->chk, "elm,state,toggle,off", "elm");
}
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
}
}
else