kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

theme: use 'visible' style signals for spin_button button/entry visibility 

Summary:
ref T8231
Depends on D10158

Reviewers: segfaultxavi

Reviewed By: segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T8231

Differential Revision: https://phab.enlightenment.org/D10159
This commit is contained in:
Mike Blumenkrantz 2019-09-25 17:55:40 -04:00
parent 9b18e5a291
commit 41f37c328e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/elementary/themes/edc/efl/datepicker.edc
View File

@ -282,25 +282,25 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
} }
programs { programs {
program { "entry_active"; program { "entry_active";
signal: "efl,state,entry,active"; signal: "efl,entry,visible,on";
source: "efl"; source: "efl";
action: STATE_SET "active"; action: STATE_SET "active";
target: "efl.entry"; target: "efl.entry";
} }
program { "entry_inactive"; program { "entry_inactive";
signal: "efl,state,entry,inactive"; signal: "efl,entry,visible,off";
source: "efl"; source: "efl";
action: STATE_SET "default"; action: STATE_SET "default";
target: "efl.entry"; target: "efl.entry";
} }
program { "text_button_active"; program { "text_button_active";
signal: "efl,state,button,active"; signal: "efl,button,visible,on";
source: "efl"; source: "efl";
action: STATE_SET "default"; action: STATE_SET "default";
target: "efl.text_button"; target: "efl.text_button";
} }
program { "text_button_inactive"; program { "text_button_inactive";
signal: "efl,state,button,inactive"; signal: "efl,button,visible,off";
source: "efl"; source: "efl";
action: STATE_SET "inactive"; action: STATE_SET "inactive";
target: "efl.text_button"; target: "efl.text_button";

8
data/elementary/themes/edc/efl/spin_button.edc
View File

@ -101,25 +101,25 @@ group { "efl/spin_button/horizontal";
} }
programs { programs {
program { "entry_active"; program { "entry_active";
signal: "efl,state,entry,active"; signal: "efl,entry,visible,on";
source: "efl"; source: "efl";
action: STATE_SET "active"; action: STATE_SET "active";
target: "efl.entry"; target: "efl.entry";
} }
program { "entry_inactive"; program { "entry_inactive";
signal: "efl,state,entry,inactive"; signal: "efl,entry,visible,off";
source: "efl"; source: "efl";
action: STATE_SET "default"; action: STATE_SET "default";
target: "efl.entry"; target: "efl.entry";
} }
program { "text_button_active"; program { "text_button_active";
signal: "efl,state,button,active"; signal: "efl,button,visible,on";
source: "efl"; source: "efl";
action: STATE_SET "default"; action: STATE_SET "default";
target: "efl.text_button"; target: "efl.text_button";
} }
program { "text_button_inactive"; program { "text_button_inactive";
signal: "efl,state,button,inactive"; signal: "efl,button,visible,off";
source: "efl"; source: "efl";
action: STATE_SET "inactive"; action: STATE_SET "inactive";
target: "efl.text_button"; target: "efl.text_button";

8
src/lib/elementary/efl_ui_spin_button.c
View File

@ -167,8 +167,8 @@ _entry_hide(Evas_Object *obj)
{ {
Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
efl_layout_signal_emit(obj, "efl,state,button,active", "efl"); efl_layout_signal_emit(obj, "efl,button,visible,on", "efl");
efl_layout_signal_emit(obj, "efl,state,entry,inactive", "efl"); efl_layout_signal_emit(obj, "efl,entry,visible,off", "efl");
if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj))) if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj)))
sd->entry_reactivate = EINA_TRUE; sd->entry_reactivate = EINA_TRUE;
@ -343,7 +343,7 @@ _entry_show_cb(void *data,
elm_object_focus_set(obj, EINA_TRUE); elm_object_focus_set(obj, EINA_TRUE);
elm_entry_select_all(obj); elm_entry_select_all(obj);
sd->entry_visible = EINA_TRUE; sd->entry_visible = EINA_TRUE;
efl_layout_signal_emit(data, "efl,state,button,inactive", "efl"); efl_layout_signal_emit(data, "efl,button,visible,off", "efl");
} }
static void static void
@ -378,7 +378,7 @@ _toggle_entry(Evas_Object *obj)
efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED,
_entry_focus_changed_cb, obj); _entry_focus_changed_cb, obj);
sd->entry_visible = EINA_TRUE; sd->entry_visible = EINA_TRUE;
efl_layout_signal_emit(obj, "efl,state,entry,active", "efl"); efl_layout_signal_emit(obj, "efl,entry,visible,on", "efl");
{ {
Eina_List *items = NULL; Eina_List *items = NULL;