summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorWoochan Lee <wc0917.lee@samsung.com>2017-11-20 19:12:49 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2017-11-27 19:40:31 +0900
commiteefcb49419af9d0057ba4c03e6c9009a1265e31e (patch)
treeaa4282cd4b8d311d1434a02d6ae86d850ee8bc46 /data
parent31ce5250cb125a5aee98480ba87570e9811c5c54 (diff)
efl_ui_spin: Add new spin and spin_button widgets
Summary: https://phab.enlightenment.org/T5900 Creating base class(efl_ui_spin) to support various shape of spinner. Added button interaction widget efl_ui_spin_button inherited from efl_ui_spin. Test Plan: Add tests in elementary_test. Reviewers: Jaehyun_Cho, woohyun, jpeg, singh.amitesh Subscribers: jenkins, id213sin, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5424
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/Makefile.am2
-rw-r--r--data/elementary/themes/default.edc2
-rw-r--r--data/elementary/themes/edc/elm/button.edc6
-rw-r--r--data/elementary/themes/edc/elm/entry.edc2
-rw-r--r--data/elementary/themes/edc/elm/spin.edc27
-rw-r--r--data/elementary/themes/edc/elm/spin_button.edc218
6 files changed, 257 insertions, 0 deletions
diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index dfe26d5848..f1ee7b15e8 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -146,6 +146,8 @@ elementary/themes/edc/elm/separator.edc \
146elementary/themes/edc/elm/slider.edc \ 146elementary/themes/edc/elm/slider.edc \
147elementary/themes/edc/elm/slideshow.edc \ 147elementary/themes/edc/elm/slideshow.edc \
148elementary/themes/edc/elm/spinner.edc \ 148elementary/themes/edc/elm/spinner.edc \
149elementary/themes/edc/elm/spin.edc \
150elementary/themes/edc/elm/spin_button.edc \
149elementary/themes/edc/elm/textpath.edc \ 151elementary/themes/edc/elm/textpath.edc \
150elementary/themes/edc/elm/thumb.edc \ 152elementary/themes/edc/elm/thumb.edc \
151elementary/themes/edc/elm/toolbar.edc \ 153elementary/themes/edc/elm/toolbar.edc \
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 5e54ffdcdd..9d615295b1 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -67,6 +67,8 @@ collections {
67#include "edc/elm/border.edc" 67#include "edc/elm/border.edc"
68// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh? 68// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
69#include "edc/elm/spinner.edc" 69#include "edc/elm/spinner.edc"
70#include "edc/elm/spin.edc"
71#include "edc/elm/spin_button.edc"
70#include "edc/elm/menu.edc" 72#include "edc/elm/menu.edc"
71#include "edc/elm/clock.edc" 73#include "edc/elm/clock.edc"
72#include "edc/elm/gengrid.edc" 74#include "edc/elm/gengrid.edc"
diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc
index a05260f4e3..c5c48d3a21 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -1472,6 +1472,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
1472/******************* SPINNER BUTTONS STYLES **********************/ 1472/******************* SPINNER BUTTONS STYLES **********************/
1473 group { name: "elm/button/base/spinner/increase/default"; 1473 group { name: "elm/button/base/spinner/increase/default";
1474 alias: "elm/button/base/spinner/increase/colorselector/default"; 1474 alias: "elm/button/base/spinner/increase/colorselector/default";
1475 alias: "elm/button/base/spin_button/increase/default";
1475 alias: "elm/button/base/calendar/increase/default"; 1476 alias: "elm/button/base/calendar/increase/default";
1476 alias: "elm/button/base/calendar/increase/double_spinners"; 1477 alias: "elm/button/base/calendar/increase/double_spinners";
1477 images.image: "sym_right_light_normal.png" COMP; 1478 images.image: "sym_right_light_normal.png" COMP;
@@ -1626,6 +1627,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
1626 group { name: "elm/button/base/spinner/decrease/default"; 1627 group { name: "elm/button/base/spinner/decrease/default";
1627 alias: "elm/button/base/spinner/decrease/colorselector/default"; 1628 alias: "elm/button/base/spinner/decrease/colorselector/default";
1628 inherit: "elm/button/base/spinner/increase/default"; 1629 inherit: "elm/button/base/spinner/increase/default";
1630 alias: "elm/button/base/spin_button/decrease/default";
1629 alias: "elm/button/base/calendar/decrease/default"; 1631 alias: "elm/button/base/calendar/decrease/default";
1630 alias: "elm/button/base/calendar/decrease/double_spinners"; 1632 alias: "elm/button/base/calendar/decrease/double_spinners";
1631 images.image: "sym_left_light_normal.png" COMP; 1633 images.image: "sym_left_light_normal.png" COMP;
@@ -1654,6 +1656,8 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
1654 group { name: "elm/button/base/spinner/default"; 1656 group { name: "elm/button/base/spinner/default";
1655 alias: "elm/button/base/spinner/colorselector/default"; 1657 alias: "elm/button/base/spinner/colorselector/default";
1656 alias: "elm/button/base/spinner/vertical"; 1658 alias: "elm/button/base/spinner/vertical";
1659 alias: "elm/button/base/spin_button/default";
1660 alias: "elm/button/base/spin_button/vertical";
1657 parts { 1661 parts {
1658 part { name: "bg"; 1662 part { name: "bg";
1659 type: SPACER; 1663 type: SPACER;
@@ -1730,6 +1734,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
1730 } 1734 }
1731 group { name: "elm/button/base/spinner/increase/vertical"; 1735 group { name: "elm/button/base/spinner/increase/vertical";
1732 inherit: "elm/button/base/spinner/increase/default"; 1736 inherit: "elm/button/base/spinner/increase/default";
1737 alias: "elm/button/base/spin_button/increase/vertical";
1733 images.image: "sym_up_light_normal.png" COMP; 1738 images.image: "sym_up_light_normal.png" COMP;
1734 images.image: "sym_up_glow_normal.png" COMP; 1739 images.image: "sym_up_glow_normal.png" COMP;
1735 images.image: "sym_up_dark_normal.png" COMP; 1740 images.image: "sym_up_dark_normal.png" COMP;
@@ -1755,6 +1760,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
1755 1760
1756 group { name: "elm/button/base/spinner/decrease/vertical"; 1761 group { name: "elm/button/base/spinner/decrease/vertical";
1757 inherit: "elm/button/base/spinner/decrease/default"; 1762 inherit: "elm/button/base/spinner/decrease/default";
1763 alias: "elm/button/base/spin_button/decrease/vertical";
1758 images.image: "sym_down_light_normal.png" COMP; 1764 images.image: "sym_down_light_normal.png" COMP;
1759 images.image: "sym_down_glow_normal.png" COMP; 1765 images.image: "sym_down_glow_normal.png" COMP;
1760 images.image: "sym_down_dark_normal.png" COMP; 1766 images.image: "sym_down_dark_normal.png" COMP;
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index 4c43cff3df..bf881daf5b 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -854,6 +854,8 @@ group { name: "elm/entry/base-single/default";
854 854
855group { name: "elm/entry/base-single/spinner/default"; 855group { name: "elm/entry/base-single/spinner/default";
856 alias: "elm/entry/base-single/spinner/vertical"; 856 alias: "elm/entry/base-single/spinner/vertical";
857 alias: "elm/entry/base-single/spin_button/default";
858 alias: "elm/entry/base-single/spin_button/vertical";
857 inherit: "elm/entry/base-single/default"; 859 inherit: "elm/entry/base-single/default";
858 styles { 860 styles {
859 style { name: "entry_single_spinner_style"; 861 style { name: "entry_single_spinner_style";
diff --git a/data/elementary/themes/edc/elm/spin.edc b/data/elementary/themes/edc/elm/spin.edc
new file mode 100644
index 0000000000..77cf917fd8
--- /dev/null
+++ b/data/elementary/themes/edc/elm/spin.edc
@@ -0,0 +1,27 @@
1group { name: "elm/spin/base/default";
2 parts {
3 part { name: "bg";
4 type: RECT;
5 scale: 1;
6 description { state: "default" 0.0;
7 color: 0 0 0 0;
8 }
9 }
10 part { name: "elm.text";
11 type: TEXT;
12 mouse_events: 0;
13 scale: 1;
14 description { state: "default" 0.0;
15 color: FN_COL_DEFAULT;
16 text {
17 font: FNBD;
18 size: 10;
19 min: 1 1;
20 ellipsis: -1;
21 align: 0.5 0.5;
22 }
23 rel.to: "bg";
24 }
25 }
26 }
27}
diff --git a/data/elementary/themes/edc/elm/spin_button.edc b/data/elementary/themes/edc/elm/spin_button.edc
new file mode 100644
index 0000000000..5b53382691
--- /dev/null
+++ b/data/elementary/themes/edc/elm/spin_button.edc
@@ -0,0 +1,218 @@
1group { name: "elm/spin_button/base/default";
2 images.image: "vert_bar_inset.png" COMP;
3 parts {
4 part { name: "clip"; type: RECT;
5 description { state: "default" 0.0;
6 rel1.to: "elm.swallow.text_button";
7 rel2.to: "elm.swallow.text_button";
8 }
9 }
10 part { name: "bg";
11 type: RECT;
12 scale: 1;
13 description { state: "default" 0.0;
14 color_class: "spinner_bg";
15 }
16 }
17 part { name: "inset"; mouse_events: 0;
18 description { state: "default" 0.0;
19 rel1.offset: 0 1;
20 rel2.offset: -1 -2;
21 image.normal: "vert_bar_inset.png";
22 image.border: 1 1 8 6;
23 image.middle: 0;
24 fill.smooth: 0;
25 }
26 }
27 part { name: "access";
28 type: RECT;
29 repeat_events: 1;
30 description { state: "default" 0.0;
31 fixed: 1 1;
32 color: 0 0 0 0;
33 rel1.to: "inset";
34 rel2.to: "inset";
35 visible: 0;
36 }
37 description { state: "active" 0.0;
38 inherit: "default" 0.0;
39 visible: 1;
40 }
41 }
42 part { name: "elm.swallow.entry";
43 type: SWALLOW;
44 clip_to: "clip";
45 description { state: "default" 0.0;
46 fixed: 1 1;
47 rel1.to: "elm.swallow.text_button";
48 rel2.to: "elm.swallow.text_button";
49 visible: 0;
50 }
51 description { state: "active" 0.0;
52 inherit: "default" 0.0;
53 visible: 1;
54 }
55 }
56 part { name: "elm.swallow.dec_button";
57 type: SWALLOW;
58 scale: 1;
59 description { state: "default" 0.0;
60 fixed: 1 0;
61 rel1.to: "inset";
62 rel1.offset: 1 1;
63 rel2.to: "inset";
64 rel2.offset: 1 -2;
65 rel2.relative: 0.0 1.0;
66 align: 0.0 0.5;
67 min: 15 15;
68 aspect: 1.0 1.0; aspect_preference: VERTICAL;
69 }
70 }
71 part { name: "elm.swallow.inc_button";
72 type: SWALLOW;
73 scale: 1;
74 description { state: "default" 0.0;
75 fixed: 1 0;
76 rel1.to: "inset";
77 rel1.offset: 1 1;
78 rel1.relative: 1.0 0.0;
79 rel2.to: "inset";
80 rel2.offset: 1 -2;
81 align: 1.0 0.5;
82 min: 15 15;
83 aspect: 1.0 1.0; aspect_preference: VERTICAL;
84 }
85 }
86 part { name: "elm.swallow.text_button";
87 type: SWALLOW;
88 scale: 1;
89 description { state: "default" 0.0;
90 visible: 1;
91 rel1.to_y: "inset";
92 rel1.to_x: "elm.swallow.dec_button";
93 rel1.relative: 1.0 0.0;
94 rel1.offset: 1 1;
95 rel2.to_y: "inset";
96 rel2.to_x: "elm.swallow.inc_button";
97 rel2.relative: 0.0 1.0;
98 rel2.offset: -2 -2;
99 }
100 description { state: "inactive" 0.0;
101 inherit: "default" 0.0;
102 visible: 0;
103 }
104 }
105 part { name: "disabler";
106 type: RECT;
107 repeat_events: 0;
108 mouse_events: 0;
109 description { state: "default" 0.0;
110 color: 0 0 0 0;
111 visible: 0;
112 }
113 description { state: "disabled" 0.0;
114 inherit: "default" 0.0;
115 visible: 1;
116 }
117 }
118 }
119 programs {
120 program { name: "entry_active";
121 signal: "elm,state,entry,active";
122 source: "elm";
123 action: STATE_SET "active" 0.0;
124 target: "elm.swallow.entry";
125 }
126 program { name: "entry_inactive";
127 signal: "elm,state,entry,inactive";
128 source: "elm";
129 action: STATE_SET "default" 0.0;
130 target: "elm.swallow.entry";
131 }
132 program { name: "text_button_active";
133 signal: "elm,state,button,active";
134 source: "elm";
135 action: STATE_SET "default" 0.0;
136 target: "elm.swallow.text_button";
137 }
138 program { name: "text_button_inactive";
139 signal: "elm,state,button,inactive";
140 source: "elm";
141 action: STATE_SET "inactive" 0.0;
142 target: "elm.swallow.text_button";
143 }
144 program { name: "access_activate";
145 signal: "elm,state,access,active";
146 source: "elm";
147 action: STATE_SET "active" 0.0;
148 target: "access";
149 }
150 program { name: "access_inactivate";
151 signal: "elm,state,access,inactive";
152 source: "elm";
153 action: STATE_SET "default" 0.0;
154 target: "access";
155 }
156 program { name: "disable";
157 signal: "elm,state,disabled";
158 source: "elm";
159 action: STATE_SET "disabled" 0.0;
160 target: "disabler";
161 }
162 program { name: "enable";
163 signal: "elm,state,enabled";
164 source: "elm";
165 action: STATE_SET "default" 0.0;
166 target: "disabler";
167 }
168 }
169}
170
171group { name: "elm/spin_button/base/vertical";
172 inherit: "elm/spin_button/base/default";
173 parts {
174 part { name: "elm.swallow.inc_button";
175 type: SWALLOW;
176 scale: 1;
177 description { state: "default" 0.0;
178 rel1.to: "inset";
179 rel1.offset: 1 1;
180 rel1.relative: 1.0 0.0;
181 rel2.to: "inset";
182 rel2.offset: 1 -2;
183 align: 1.0 0.5;
184 }
185 }
186 part { name: "elm.swallow.text_button";
187 type: SWALLOW;
188 scale: 1;
189 description { state: "default" 0.0;
190 visible: 1;
191 rel1.to_y: "inset";
192 rel1.to_x: "elm.swallow.dec_button";
193 rel1.relative: 1.0 0.0;
194 rel1.offset: 1 1;
195 rel2.to_y: "inset";
196 rel2.to_x: "elm.swallow.inc_button";
197 rel2.relative: 0.0 1.0;
198 rel2.offset: -2 -2;
199 }
200 description { state: "active" 0.0;
201 inherit: "default" 0.0;
202 visible: 0;
203 }
204 }
205 part { name: "elm.swallow.dec_button";
206 type: SWALLOW;
207 scale: 1;
208 description { state: "default" 0.0;
209 rel1.to: "inset";
210 rel1.offset: 1 1;
211 rel2.to: "inset";
212 rel2.offset: 1 -2;
213 rel2.relative: 0.0 1.0;
214 align: 0.0 0.5;
215 }
216 }
217 }
218}