summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-25 17:55:40 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-09-25 17:55:40 -0400
commit41f37c328ee9dca9a252ac5a81683c2a496d28a0 (patch)
tree584d15a9e076aca8670406f3f3ba87c134b0f88f
parent9b18e5a29160a631943b5b99e305a41e8aa16410 (diff)
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
-rw-r--r--data/elementary/themes/edc/efl/datepicker.edc8
-rw-r--r--data/elementary/themes/edc/efl/spin_button.edc8
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c8
3 files changed, 12 insertions, 12 deletions
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index a0c2359..cc913e2 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -282,25 +282,25 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
282 } 282 }
283 programs { 283 programs {
284 program { "entry_active"; 284 program { "entry_active";
285 signal: "efl,state,entry,active"; 285 signal: "efl,entry,visible,on";
286 source: "efl"; 286 source: "efl";
287 action: STATE_SET "active"; 287 action: STATE_SET "active";
288 target: "efl.entry"; 288 target: "efl.entry";
289 } 289 }
290 program { "entry_inactive"; 290 program { "entry_inactive";
291 signal: "efl,state,entry,inactive"; 291 signal: "efl,entry,visible,off";
292 source: "efl"; 292 source: "efl";
293 action: STATE_SET "default"; 293 action: STATE_SET "default";
294 target: "efl.entry"; 294 target: "efl.entry";
295 } 295 }
296 program { "text_button_active"; 296 program { "text_button_active";
297 signal: "efl,state,button,active"; 297 signal: "efl,button,visible,on";
298 source: "efl"; 298 source: "efl";
299 action: STATE_SET "default"; 299 action: STATE_SET "default";
300 target: "efl.text_button"; 300 target: "efl.text_button";
301 } 301 }
302 program { "text_button_inactive"; 302 program { "text_button_inactive";
303 signal: "efl,state,button,inactive"; 303 signal: "efl,button,visible,off";
304 source: "efl"; 304 source: "efl";
305 action: STATE_SET "inactive"; 305 action: STATE_SET "inactive";
306 target: "efl.text_button"; 306 target: "efl.text_button";
diff --git a/data/elementary/themes/edc/efl/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc
index 91dff76..5008295 100644
--- a/data/elementary/themes/edc/efl/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -101,25 +101,25 @@ group { "efl/spin_button/horizontal";
101 } 101 }
102 programs { 102 programs {
103 program { "entry_active"; 103 program { "entry_active";
104 signal: "efl,state,entry,active"; 104 signal: "efl,entry,visible,on";
105 source: "efl"; 105 source: "efl";
106 action: STATE_SET "active"; 106 action: STATE_SET "active";
107 target: "efl.entry"; 107 target: "efl.entry";
108 } 108 }
109 program { "entry_inactive"; 109 program { "entry_inactive";
110 signal: "efl,state,entry,inactive"; 110 signal: "efl,entry,visible,off";
111 source: "efl"; 111 source: "efl";
112 action: STATE_SET "default"; 112 action: STATE_SET "default";
113 target: "efl.entry"; 113 target: "efl.entry";
114 } 114 }
115 program { "text_button_active"; 115 program { "text_button_active";
116 signal: "efl,state,button,active"; 116 signal: "efl,button,visible,on";
117 source: "efl"; 117 source: "efl";
118 action: STATE_SET "default"; 118 action: STATE_SET "default";
119 target: "efl.text_button"; 119 target: "efl.text_button";
120 } 120 }
121 program { "text_button_inactive"; 121 program { "text_button_inactive";
122 signal: "efl,state,button,inactive"; 122 signal: "efl,button,visible,off";
123 source: "efl"; 123 source: "efl";
124 action: STATE_SET "inactive"; 124 action: STATE_SET "inactive";
125 target: "efl.text_button"; 125 target: "efl.text_button";
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index a4c9122..bbfd7d7 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -167,8 +167,8 @@ _entry_hide(Evas_Object *obj)
167{ 167{
168 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS); 168 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
169 169
170 efl_layout_signal_emit(obj, "efl,state,button,active", "efl"); 170 efl_layout_signal_emit(obj, "efl,button,visible,on", "efl");
171 efl_layout_signal_emit(obj, "efl,state,entry,inactive", "efl"); 171 efl_layout_signal_emit(obj, "efl,entry,visible,off", "efl");
172 172
173 if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj))) 173 if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj)))
174 sd->entry_reactivate = EINA_TRUE; 174 sd->entry_reactivate = EINA_TRUE;
@@ -343,7 +343,7 @@ _entry_show_cb(void *data,
343 elm_object_focus_set(obj, EINA_TRUE); 343 elm_object_focus_set(obj, EINA_TRUE);
344 elm_entry_select_all(obj); 344 elm_entry_select_all(obj);
345 sd->entry_visible = EINA_TRUE; 345 sd->entry_visible = EINA_TRUE;
346 efl_layout_signal_emit(data, "efl,state,button,inactive", "efl"); 346 efl_layout_signal_emit(data, "efl,button,visible,off", "efl");
347} 347}
348 348
349static void 349static void
@@ -378,7 +378,7 @@ _toggle_entry(Evas_Object *obj)
378 efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, 378 efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED,
379 _entry_focus_changed_cb, obj); 379 _entry_focus_changed_cb, obj);
380 sd->entry_visible = EINA_TRUE; 380 sd->entry_visible = EINA_TRUE;
381 efl_layout_signal_emit(obj, "efl,state,entry,active", "efl"); 381 efl_layout_signal_emit(obj, "efl,entry,visible,on", "efl");
382 { 382 {
383 Eina_List *items = NULL; 383 Eina_List *items = NULL;
384 384