summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorWoochanlee <wc0917.lee@samsung.com>2018-08-21 13:52:28 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-21 13:52:29 +0900
commit739da4f736cec242042ba3a39d8a7c2417d924ab (patch)
tree4b97b79eece027abb0059b066fc005982f122058 /data
parent28ee520428872f4503be036492db9f7455fc2e8c (diff)
efl_ui_spin_button: Addded direction feature.
Summary: The Spin_Button class supports two types(horizontal, vertical). User can use 'efl_ui_direction()' for spin_button. @feature Test Plan: elementary_test-> spin_button sample. Reviewers: Hermet, Jaehyun_Cho Subscribers: cedric, #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6680
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/efl/datepicker.edc12
-rw-r--r--data/elementary/themes/edc/efl/spin_button.edc83
-rw-r--r--data/elementary/themes/edc/efl/timepicker.edc15
3 files changed, 40 insertions, 70 deletions
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index e15343a..31eb206 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -331,15 +331,3 @@ group { "efl/datepicker/spin_button";
331 } 331 }
332 } 332 }
333} 333}
334
335group { "efl/datepicker/spin_button/text_button";
336 inherit: "efl/spin_button/text_button";
337}
338
339group { "efl/datepicker/spin_button/inc_button";
340 inherit: "efl/spin_button/inc_button:vertical";
341}
342
343group { "efl/datepicker/spin_button/dec_button";
344 inherit: "efl/spin_button/dec_button:vertical";
345}
diff --git a/data/elementary/themes/edc/efl/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc
index 4cb7783..417d002 100644
--- a/data/elementary/themes/edc/efl/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -1,4 +1,4 @@
1group { "efl/spin_button"; 1group { "efl/spin_button/horizontal";
2 images.image: "vert_bar_inset.png" COMP; 2 images.image: "vert_bar_inset.png" COMP;
3 parts { 3 parts {
4 rect { "clip"; 4 rect { "clip";
@@ -53,11 +53,6 @@ group { "efl/spin_button";
53 scale; 53 scale;
54 desc { "default"; 54 desc { "default";
55 fixed: 1 0; 55 fixed: 1 0;
56 rel1.to: "inset";
57 rel1.offset: 1 1;
58 rel2.to: "inset";
59 rel2.offset: 1 -2;
60 rel2.relative: 0.0 1.0;
61 align: 0.0 0.5; 56 align: 0.0 0.5;
62 min: 15 15; 57 min: 15 15;
63 aspect: 1.0 1.0; aspect_preference: VERTICAL; 58 aspect: 1.0 1.0; aspect_preference: VERTICAL;
@@ -67,11 +62,6 @@ group { "efl/spin_button";
67 scale; 62 scale;
68 desc { "default"; 63 desc { "default";
69 fixed: 1 0; 64 fixed: 1 0;
70 rel1.to: "inset";
71 rel1.offset: 1 1;
72 rel1.relative: 1.0 0.0;
73 rel2.to: "inset";
74 rel2.offset: 1 -2;
75 align: 1.0 0.5; 65 align: 1.0 0.5;
76 min: 15 15; 66 min: 15 15;
77 aspect: 1.0 1.0; aspect_preference: VERTICAL; 67 aspect: 1.0 1.0; aspect_preference: VERTICAL;
@@ -160,47 +150,53 @@ group { "efl/spin_button";
160 } 150 }
161} 151}
162 152
163group { "efl/spin_button:vertical"; 153group { "efl/spin_button/vertical";
164 inherit: "efl/spin_button"; 154 inherit: "efl/spin_button/horizontal";
165 parts { 155 parts {
156 image { "inset"; nomouse;
157 desc { "default";
158 min: 40 150;
159 }
160 }
166 swallow { "efl.inc_button"; 161 swallow { "efl.inc_button";
167 scale; 162 scale;
168 desc { "default"; 163 desc { "default";
169 rel1.to: "inset"; 164 rel.to: "inset";
170 rel1.offset: 1 1; 165 align: 0.5 0.0;
171 rel1.relative: 1.0 0.0; 166 min: 40 40;
172 rel2.to: "inset"; 167 max: 40 40;
173 rel2.offset: 1 -2; 168 fixed: 1 1;
174 align: 1.0 0.5;
175 } 169 }
176 } 170 }
177 swallow { "efl.text_button"; 171 swallow { "efl.dec_button";
178 scale; 172 scale;
179 desc { "default"; 173 desc { "default";
180 vis; 174 rel.to: "inset";
181 rel1.to_y: "inset"; 175 align: 0.5 1.0;
182 rel1.to_x: "efl.dec_button"; 176 min: 40 40;
183 rel1.relative: 1.0 0.0; 177 max: 40 40;
184 rel1.offset: 1 1; 178 fixed: 1 1;
185 rel2.to_y: "inset";
186 rel2.to_x: "efl.inc_button";
187 rel2.relative: 0.0 1.0;
188 rel2.offset: -2 -2;
189 }
190 desc { "active";
191 inherit: "default";
192 hid;
193 } 179 }
194 } 180 }
195 swallow { "efl.dec_button"; 181 swallow { "efl.text_button";
196 scale; 182 scale;
197 desc { "default"; 183 desc { "default";
198 rel1.to: "inset"; 184 rel.to_x: "inset";
199 rel1.offset: 1 1; 185 rel1 {
200 rel2.to: "inset"; 186 to_y: "efl.inc_button";
201 rel2.offset: 1 -2; 187 relative: 0.0 1.0;
202 rel2.relative: 0.0 1.0; 188 }
203 align: 0.0 0.5; 189 rel2 {
190 to_y: "efl.dec_button";
191 relative: 1.0 0.0;
192 }
193 min: 0 70;
194 max: -1 70;
195 fixed: 0 1;
196 }
197 desc { "inactive";
198 inherit: "default";
199 hid;
204 } 200 }
205 } 201 }
206 } 202 }
@@ -357,6 +353,7 @@ group { "efl/spin_button/inc_button";
357} 353}
358 354
359group { "efl/spin_button/entry"; 355group { "efl/spin_button/entry";
356 alias: "efl/spin_button/vertical/entry";
360 inherit: "efl/text"; 357 inherit: "efl/text";
361} 358}
362 359
@@ -386,7 +383,7 @@ group { "efl/spin_button/dec_button";
386} 383}
387 384
388group { "efl/spin_button/text_button"; 385group { "efl/spin_button/text_button";
389 alias: "efl/spin_button/text_button:vertical"; 386 alias: "efl/spin_button/vertical/text_button";
390 parts { 387 parts {
391 part { name: "bg"; 388 part { name: "bg";
392 type: SPACER; 389 type: SPACER;
@@ -462,7 +459,7 @@ group { "efl/spin_button/text_button";
462 } 459 }
463} 460}
464 461
465group { "efl/spin_button/inc_button:vertical"; 462group { "efl/spin_button/vertical/inc_button";
466 inherit: "efl/spin_button/inc_button"; 463 inherit: "efl/spin_button/inc_button";
467 images.image: "sym_up_light_normal.png" COMP; 464 images.image: "sym_up_light_normal.png" COMP;
468 images.image: "sym_up_glow_normal.png" COMP; 465 images.image: "sym_up_glow_normal.png" COMP;
@@ -487,7 +484,7 @@ group { "efl/spin_button/inc_button:vertical";
487 } 484 }
488} 485}
489 486
490group { "efl/spin_button/dec_button:vertical"; 487group { "efl/spin_button/vertical/dec_button";
491 inherit: "efl/spin_button/dec_button"; 488 inherit: "efl/spin_button/dec_button";
492 images.image: "sym_down_light_normal.png" COMP; 489 images.image: "sym_down_light_normal.png" COMP;
493 images.image: "sym_down_glow_normal.png" COMP; 490 images.image: "sym_down_glow_normal.png" COMP;
diff --git a/data/elementary/themes/edc/efl/timepicker.edc b/data/elementary/themes/edc/efl/timepicker.edc
index c5a2a6a..d045e73 100644
--- a/data/elementary/themes/edc/efl/timepicker.edc
+++ b/data/elementary/themes/edc/efl/timepicker.edc
@@ -377,21 +377,6 @@ group { "efl/timepicker";
377 } 377 }
378} 378}
379 379
380group { "efl/timepicker/spin_button";
381 inherit: "efl/datepicker/spin_button";
382}
383
384group { "efl/timepicker/spin_button/text_button";
385 inherit: "efl/spin_button/text_button";
386}
387
388group { "efl/timepicker/spin_button/inc_button";
389 inherit: "efl/spin_button/inc_button:vertical";
390}
391
392group { "efl/timepicker/spin_button/dec_button";
393 inherit: "efl/spin_button/dec_button:vertical";
394}
395group { "efl/timepicker/button"; 380group { "efl/timepicker/button";
396 inherit: "efl/button"; 381 inherit: "efl/button";
397 parts { 382 parts {