summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSungtaek Hong <sth253.hong@samsung.com>2017-12-08 14:52:08 +0900
committerSungtaek Hong <sth253.hong@samsung.com>2017-12-08 16:02:24 +0900
commit1503fb53599602cda091d9bb7843de7056e95e1b (patch)
treeb3e1ebec7a933f4c4229e013d48acf4f8d175eb5 /data
parente29b9e5371923f74b2be0a30d5441ca6948151e3 (diff)
efl_ui_spin: apply new theme set policy
Summary: Applied new theme group name. Moved logic in finalize to constructor. Test Plan: Run elementary_test->Efl.Ui.Spin, Efl.Ui.Spin.Button, Part_Background Reviewers: jpeg, woohyun, CHAN Reviewed By: CHAN Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5592
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/Makefile.am4
-rw-r--r--data/elementary/themes/default.edc4
-rw-r--r--data/elementary/themes/edc/efl/spin.edc (renamed from data/elementary/themes/edc/elm/spin.edc)18
-rw-r--r--data/elementary/themes/edc/efl/spin_button.edc (renamed from data/elementary/themes/edc/elm/spin_button.edc)182
4 files changed, 108 insertions, 100 deletions
diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index 4bc6ec9987..40ff6973c8 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -145,8 +145,6 @@ elementary/themes/edc/elm/separator.edc \
145elementary/themes/edc/elm/slider.edc \ 145elementary/themes/edc/elm/slider.edc \
146elementary/themes/edc/elm/slideshow.edc \ 146elementary/themes/edc/elm/slideshow.edc \
147elementary/themes/edc/elm/spinner.edc \ 147elementary/themes/edc/elm/spinner.edc \
148elementary/themes/edc/elm/spin.edc \
149elementary/themes/edc/elm/spin_button.edc \
150elementary/themes/edc/elm/textpath.edc \ 148elementary/themes/edc/elm/textpath.edc \
151elementary/themes/edc/elm/thumb.edc \ 149elementary/themes/edc/elm/thumb.edc \
152elementary/themes/edc/elm/toolbar.edc \ 150elementary/themes/edc/elm/toolbar.edc \
@@ -1033,6 +1031,8 @@ elementary/themes/edc/efl/progress.edc \
1033elementary/themes/edc/efl/radio.edc \ 1031elementary/themes/edc/efl/radio.edc \
1034elementary/themes/edc/efl/scroller.edc \ 1032elementary/themes/edc/efl/scroller.edc \
1035elementary/themes/edc/efl/slider.edc \ 1033elementary/themes/edc/efl/slider.edc \
1034elementary/themes/edc/efl/spin.edc \
1035elementary/themes/edc/efl/spin_button.edc \
1036elementary/themes/edc/efl/text.edc \ 1036elementary/themes/edc/efl/text.edc \
1037elementary/themes/edc/efl/textpath.edc \ 1037elementary/themes/edc/efl/textpath.edc \
1038elementary/themes/edc/efl/tooltip.edc \ 1038elementary/themes/edc/efl/tooltip.edc \
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 1bbd492217..119f42eeba 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -66,8 +66,6 @@ collections {
66#include "edc/elm/border.edc" 66#include "edc/elm/border.edc"
67// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh? 67// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
68#include "edc/elm/spinner.edc" 68#include "edc/elm/spinner.edc"
69#include "edc/elm/spin.edc"
70#include "edc/elm/spin_button.edc"
71#include "edc/elm/menu.edc" 69#include "edc/elm/menu.edc"
72#include "edc/elm/clock.edc" 70#include "edc/elm/clock.edc"
73#include "edc/elm/gengrid.edc" 71#include "edc/elm/gengrid.edc"
@@ -187,6 +185,8 @@ collections {
187#include "edc/efl/photocam.edc" 185#include "edc/efl/photocam.edc"
188#include "edc/efl/progress.edc" 186#include "edc/efl/progress.edc"
189#include "edc/efl/border.edc" 187#include "edc/efl/border.edc"
188#include "edc/efl/spin.edc"
189#include "edc/efl/spin_button.edc"
190// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh? 190// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
191#include "edc/efl/cursor.edc" 191#include "edc/efl/cursor.edc"
192#include "edc/efl/textpath.edc" 192#include "edc/efl/textpath.edc"
diff --git a/data/elementary/themes/edc/elm/spin.edc b/data/elementary/themes/edc/efl/spin.edc
index 77cf917fd8..a794080dae 100644
--- a/data/elementary/themes/edc/elm/spin.edc
+++ b/data/elementary/themes/edc/efl/spin.edc
@@ -1,17 +1,15 @@
1group { name: "elm/spin/base/default"; 1group { "efl/spin";
2 parts { 2 parts {
3 part { name: "bg"; 3 rect { "bg";
4 type: RECT; 4 scale;
5 scale: 1; 5 desc { "default";
6 description { state: "default" 0.0;
7 color: 0 0 0 0; 6 color: 0 0 0 0;
8 } 7 }
9 } 8 }
10 part { name: "elm.text"; 9 text { "elm.text";
11 type: TEXT; 10 nomouse;
12 mouse_events: 0; 11 scale;
13 scale: 1; 12 desc { "default";
14 description { state: "default" 0.0;
15 color: FN_COL_DEFAULT; 13 color: FN_COL_DEFAULT;
16 text { 14 text {
17 font: FNBD; 15 font: FNBD;
diff --git a/data/elementary/themes/edc/elm/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc
index 5b53382691..40e9492a2e 100644
--- a/data/elementary/themes/edc/elm/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -1,21 +1,19 @@
1group { name: "elm/spin_button/base/default"; 1group { "efl/spin_button";
2 images.image: "vert_bar_inset.png" COMP; 2 images.image: "vert_bar_inset.png" COMP;
3 parts { 3 parts {
4 part { name: "clip"; type: RECT; 4 rect { "clip";
5 description { state: "default" 0.0; 5 desc { "default";
6 rel1.to: "elm.swallow.text_button"; 6 rel.to: "elm.swallow.text_button";
7 rel2.to: "elm.swallow.text_button";
8 } 7 }
9 } 8 }
10 part { name: "bg"; 9 rect { "bg";
11 type: RECT; 10 scale;
12 scale: 1; 11 desc { "default";
13 description { state: "default" 0.0;
14 color_class: "spinner_bg"; 12 color_class: "spinner_bg";
15 } 13 }
16 } 14 }
17 part { name: "inset"; mouse_events: 0; 15 image { "inset"; nomouse;
18 description { state: "default" 0.0; 16 desc { "default";
19 rel1.offset: 0 1; 17 rel1.offset: 0 1;
20 rel2.offset: -1 -2; 18 rel2.offset: -1 -2;
21 image.normal: "vert_bar_inset.png"; 19 image.normal: "vert_bar_inset.png";
@@ -24,39 +22,36 @@ group { name: "elm/spin_button/base/default";
24 fill.smooth: 0; 22 fill.smooth: 0;
25 } 23 }
26 } 24 }
27 part { name: "access"; 25 rect { "access";
28 type: RECT; 26 repeat;
29 repeat_events: 1; 27 desc { "default";
30 description { state: "default" 0.0;
31 fixed: 1 1; 28 fixed: 1 1;
32 color: 0 0 0 0; 29 color: 0 0 0 0;
33 rel1.to: "inset"; 30 rel1.to: "inset";
34 rel2.to: "inset"; 31 rel2.to: "inset";
35 visible: 0; 32 hid;
36 } 33 }
37 description { state: "active" 0.0; 34 desc { "active";
38 inherit: "default" 0.0; 35 inherit: "default";
39 visible: 1; 36 vis;
40 } 37 }
41 } 38 }
42 part { name: "elm.swallow.entry"; 39 swallow { "elm.swallow.entry";
43 type: SWALLOW; 40 clip: "clip";
44 clip_to: "clip"; 41 desc { "default";
45 description { state: "default" 0.0;
46 fixed: 1 1; 42 fixed: 1 1;
47 rel1.to: "elm.swallow.text_button"; 43 rel1.to: "elm.swallow.text_button";
48 rel2.to: "elm.swallow.text_button"; 44 rel2.to: "elm.swallow.text_button";
49 visible: 0; 45 hid;
50 } 46 }
51 description { state: "active" 0.0; 47 desc { "active";
52 inherit: "default" 0.0; 48 inherit: "default";
53 visible: 1; 49 vis;
54 } 50 }
55 } 51 }
56 part { name: "elm.swallow.dec_button"; 52 swallow { "elm.swallow.dec_button";
57 type: SWALLOW; 53 scale;
58 scale: 1; 54 desc { "default";
59 description { state: "default" 0.0;
60 fixed: 1 0; 55 fixed: 1 0;
61 rel1.to: "inset"; 56 rel1.to: "inset";
62 rel1.offset: 1 1; 57 rel1.offset: 1 1;
@@ -68,10 +63,9 @@ group { name: "elm/spin_button/base/default";
68 aspect: 1.0 1.0; aspect_preference: VERTICAL; 63 aspect: 1.0 1.0; aspect_preference: VERTICAL;
69 } 64 }
70 } 65 }
71 part { name: "elm.swallow.inc_button"; 66 swallow { "elm.swallow.inc_button";
72 type: SWALLOW; 67 scale;
73 scale: 1; 68 desc { "default";
74 description { state: "default" 0.0;
75 fixed: 1 0; 69 fixed: 1 0;
76 rel1.to: "inset"; 70 rel1.to: "inset";
77 rel1.offset: 1 1; 71 rel1.offset: 1 1;
@@ -83,11 +77,10 @@ group { name: "elm/spin_button/base/default";
83 aspect: 1.0 1.0; aspect_preference: VERTICAL; 77 aspect: 1.0 1.0; aspect_preference: VERTICAL;
84 } 78 }
85 } 79 }
86 part { name: "elm.swallow.text_button"; 80 swallow { "elm.swallow.text_button";
87 type: SWALLOW; 81 scale;
88 scale: 1; 82 desc { "default";
89 description { state: "default" 0.0; 83 vis;
90 visible: 1;
91 rel1.to_y: "inset"; 84 rel1.to_y: "inset";
92 rel1.to_x: "elm.swallow.dec_button"; 85 rel1.to_x: "elm.swallow.dec_button";
93 rel1.relative: 1.0 0.0; 86 rel1.relative: 1.0 0.0;
@@ -97,84 +90,82 @@ group { name: "elm/spin_button/base/default";
97 rel2.relative: 0.0 1.0; 90 rel2.relative: 0.0 1.0;
98 rel2.offset: -2 -2; 91 rel2.offset: -2 -2;
99 } 92 }
100 description { state: "inactive" 0.0; 93 desc { "inactive";
101 inherit: "default" 0.0; 94 inherit: "default";
102 visible: 0; 95 hid;
103 } 96 }
104 } 97 }
105 part { name: "disabler"; 98 rect { "disabler";
106 type: RECT; 99 norepeat;
107 repeat_events: 0; 100 nomouse;
108 mouse_events: 0; 101 desc { "default";
109 description { state: "default" 0.0;
110 color: 0 0 0 0; 102 color: 0 0 0 0;
111 visible: 0; 103 hid;
112 } 104 }
113 description { state: "disabled" 0.0; 105 desc { "disabled";
114 inherit: "default" 0.0; 106 inherit: "default";
115 visible: 1; 107 vis;
116 } 108 }
117 } 109 }
118 } 110 }
119 programs { 111 programs {
120 program { name: "entry_active"; 112 program { "entry_active";
121 signal: "elm,state,entry,active"; 113 signal: "elm,state,entry,active";
122 source: "elm"; 114 source: "elm";
123 action: STATE_SET "active" 0.0; 115 action: STATE_SET "active";
124 target: "elm.swallow.entry"; 116 target: "elm.swallow.entry";
125 } 117 }
126 program { name: "entry_inactive"; 118 program { "entry_inactive";
127 signal: "elm,state,entry,inactive"; 119 signal: "elm,state,entry,inactive";
128 source: "elm"; 120 source: "elm";
129 action: STATE_SET "default" 0.0; 121 action: STATE_SET "default";
130 target: "elm.swallow.entry"; 122 target: "elm.swallow.entry";
131 } 123 }
132 program { name: "text_button_active"; 124 program { "text_button_active";
133 signal: "elm,state,button,active"; 125 signal: "elm,state,button,active";
134 source: "elm"; 126 source: "elm";
135 action: STATE_SET "default" 0.0; 127 action: STATE_SET "default";
136 target: "elm.swallow.text_button"; 128 target: "elm.swallow.text_button";
137 } 129 }
138 program { name: "text_button_inactive"; 130 program { "text_button_inactive";
139 signal: "elm,state,button,inactive"; 131 signal: "elm,state,button,inactive";
140 source: "elm"; 132 source: "elm";
141 action: STATE_SET "inactive" 0.0; 133 action: STATE_SET "inactive";
142 target: "elm.swallow.text_button"; 134 target: "elm.swallow.text_button";
143 } 135 }
144 program { name: "access_activate"; 136 program { "access_activate";
145 signal: "elm,state,access,active"; 137 signal: "elm,state,access,active";
146 source: "elm"; 138 source: "elm";
147 action: STATE_SET "active" 0.0; 139 action: STATE_SET "active";
148 target: "access"; 140 target: "access";
149 } 141 }
150 program { name: "access_inactivate"; 142 program { "access_inactivate";
151 signal: "elm,state,access,inactive"; 143 signal: "elm,state,access,inactive";
152 source: "elm"; 144 source: "elm";
153 action: STATE_SET "default" 0.0; 145 action: STATE_SET "default";
154 target: "access"; 146 target: "access";
155 } 147 }
156 program { name: "disable"; 148 program { "disable";
157 signal: "elm,state,disabled"; 149 signal: "elm,state,disabled";
158 source: "elm"; 150 source: "elm";
159 action: STATE_SET "disabled" 0.0; 151 action: STATE_SET "disabled";
160 target: "disabler"; 152 target: "disabler";
161 } 153 }
162 program { name: "enable"; 154 program { "enable";
163 signal: "elm,state,enabled"; 155 signal: "elm,state,enabled";
164 source: "elm"; 156 source: "elm";
165 action: STATE_SET "default" 0.0; 157 action: STATE_SET "default";
166 target: "disabler"; 158 target: "disabler";
167 } 159 }
168 } 160 }
169} 161}
170 162
171group { name: "elm/spin_button/base/vertical"; 163group { "efl/spin_button:vertical";
172 inherit: "elm/spin_button/base/default"; 164 inherit: "efl/spin_button";
173 parts { 165 parts {
174 part { name: "elm.swallow.inc_button"; 166 swallow { "elm.swallow.inc_button";
175 type: SWALLOW; 167 scale;
176 scale: 1; 168 desc { "default";
177 description { state: "default" 0.0;
178 rel1.to: "inset"; 169 rel1.to: "inset";
179 rel1.offset: 1 1; 170 rel1.offset: 1 1;
180 rel1.relative: 1.0 0.0; 171 rel1.relative: 1.0 0.0;
@@ -183,11 +174,10 @@ group { name: "elm/spin_button/base/vertical";
183 align: 1.0 0.5; 174 align: 1.0 0.5;
184 } 175 }
185 } 176 }
186 part { name: "elm.swallow.text_button"; 177 swallow { "elm.swallow.text_button";
187 type: SWALLOW; 178 scale;
188 scale: 1; 179 desc { "default";
189 description { state: "default" 0.0; 180 vis;
190 visible: 1;
191 rel1.to_y: "inset"; 181 rel1.to_y: "inset";
192 rel1.to_x: "elm.swallow.dec_button"; 182 rel1.to_x: "elm.swallow.dec_button";
193 rel1.relative: 1.0 0.0; 183 rel1.relative: 1.0 0.0;
@@ -197,15 +187,14 @@ group { name: "elm/spin_button/base/vertical";
197 rel2.relative: 0.0 1.0; 187 rel2.relative: 0.0 1.0;
198 rel2.offset: -2 -2; 188 rel2.offset: -2 -2;
199 } 189 }
200 description { state: "active" 0.0; 190 desc { "active";
201 inherit: "default" 0.0; 191 inherit: "default";
202 visible: 0; 192 hid;
203 } 193 }
204 } 194 }
205 part { name: "elm.swallow.dec_button"; 195 swallow { "elm.swallow.dec_button";
206 type: SWALLOW; 196 scale;
207 scale: 1; 197 desc { "default";
208 description { state: "default" 0.0;
209 rel1.to: "inset"; 198 rel1.to: "inset";
210 rel1.offset: 1 1; 199 rel1.offset: 1 1;
211 rel2.to: "inset"; 200 rel2.to: "inset";
@@ -216,3 +205,24 @@ group { name: "elm/spin_button/base/vertical";
216 } 205 }
217 } 206 }
218} 207}
208
209group { "efl/spin_button/inc_button";
210 inherit: "elm/button/base/spinner/increase/default";
211}
212
213group { "efl/spin_button/dec_button";
214 inherit: "elm/button/base/spinner/decrease/default";
215}
216
217group { "efl/spin_button/text_button";
218 inherit: "elm/button/base/spinner/default";
219 alias: "efl/spin_button/text_button:vertical";
220}
221
222group { "efl/spin_button/inc_button:vertical";
223 inherit: "elm/button/base/spinner/increase/vertical";
224}
225
226group { "efl/spin_button/dec_button:vertical";
227 inherit: "elm/button/base/spinner/decrease/vertical";
228} \ No newline at end of file