summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiscomfitor <michael.blumenkrantz@gmail.com>2014-01-01 02:34:01 -0500
committerdiscomfitor <michael.blumenkrantz@gmail.com>2014-01-01 02:34:01 -0500
commitf935cf4fb3da23382ae2fe4d5d40e3a9ec0f8778 (patch)
tree3586d1db0921e0ad3ac3c98a4b68cade5dcde4e4
parent641cc77b317e6caff9f9d7c6c5d8831d5e315474 (diff)
greatly improve slider appearance
-rw-r--r--elm/widgets/slider.edc103
1 files changed, 40 insertions, 63 deletions
diff --git a/elm/widgets/slider.edc b/elm/widgets/slider.edc
index 8c10fec..f35336e 100644
--- a/elm/widgets/slider.edc
+++ b/elm/widgets/slider.edc
@@ -69,7 +69,7 @@ group { name: "elm/slider/hidden/limit";
69 group { name: "elm/slider/horizontal/default"; 69 group { name: "elm/slider/horizontal/default";
70 alias: "elm/slider/horizontal/disabled"; 70 alias: "elm/slider/horizontal/disabled";
71 images { 71 images {
72 image: "slider_bar.png" COMP; 72 image: "scroll_border_h.png" COMP;
73 image: "frame_label_under.png" COMP; 73 image: "frame_label_under.png" COMP;
74 } 74 }
75 parts { 75 parts {
@@ -78,13 +78,14 @@ group { name: "elm/slider/hidden/limit";
78 description { state: "default" 0.0; 78 description { state: "default" 0.0;
79 max: 99999 6; 79 max: 99999 6;
80 min: 0 6; 80 min: 0 6;
81 rel1 { to: "bg"; 81 rel1 { to: "elm.swallow.bar";
82 offset: 1 0; 82 offset: -1 -1;
83 } 83 }
84 rel2 { to: "bg"; 84 rel2 { to: "elm.swallow.bar";
85 offset: -2 -1; 85 offset: 2 2;
86 } 86 }
87 image.normal: "slider_bar.png"; 87 image.normal: "scroll_border_h.png";
88 image.border: 4 4 1 1;
88 fill.smooth: 0; 89 fill.smooth: 0;
89 } 90 }
90 } 91 }
@@ -93,11 +94,12 @@ group { name: "elm/slider/hidden/limit";
93 mouse_events: 0; 94 mouse_events: 0;
94 description { state: "default" 0.0; 95 description { state: "default" 0.0;
95 fixed: 1 1; 96 fixed: 1 1;
96 rel1.to: "base"; 97 rel1.to_x: "elm.swallow.bar";
97 rel2 { 98 rel1.to_y: "base";
98 to_y: "base"; 99 rel1.offset: 0 1;
99 to_x: "elm.dragable.slider"; 100 rel2.to_x: "elm.dragable.slider";
100 } 101 rel2.to_y: "base";
102 rel2.offset: -1 -2;
101 color: DARKNESS_BUTTON_BLUE 200; 103 color: DARKNESS_BUTTON_BLUE 200;
102 } 104 }
103 description { state: "inverted" 0.0; 105 description { state: "inverted" 0.0;
@@ -113,17 +115,6 @@ group { name: "elm/slider/hidden/limit";
113 visible: 0; 115 visible: 0;
114 } 116 }
115 } 117 }
116 part { name: "bg";
117 type: RECT;
118 mouse_events: 0;
119 scale: 1;
120 description { state: "default" 0.0;
121 visible: 0;
122 rel1.to: "elm.swallow.bar";
123 rel2.to: "elm.swallow.bar";
124 color: 0 0 0 0;
125 }
126 }
127 part { name: "elm.swallow.bar"; 118 part { name: "elm.swallow.bar";
128 type: SWALLOW; 119 type: SWALLOW;
129 scale: 1; 120 scale: 1;
@@ -137,7 +128,7 @@ group { name: "elm/slider/hidden/limit";
137 offset: 8 0; 128 offset: 8 0;
138 } 129 }
139 rel2 { 130 rel2 {
140 to_x: "elm.units"; 131 to_x: "limits";
141 relative: 0.0 1.0; 132 relative: 0.0 1.0;
142 offset: -10 -1; 133 offset: -10 -1;
143 } 134 }
@@ -194,11 +185,6 @@ group { name: "elm/slider/hidden/limit";
194 rel1.offset: 0 4; 185 rel1.offset: 0 4;
195 rel2.offset: 0 -5; 186 rel2.offset: 0 -5;
196 } 187 }
197 description { state: "disabled" 0.0;
198 inherit: "default" 0.0;
199 color: 255 128 128 128;
200 visible: 0;
201 }
202 description { state: "disabled_visible" 0.0; 188 description { state: "disabled_visible" 0.0;
203 inherit: "default" 0.0; 189 inherit: "default" 0.0;
204 color: DARKNESS_TEXT_DISABLED 128; 190 color: DARKNESS_TEXT_DISABLED 128;
@@ -328,19 +314,19 @@ group { name: "elm/slider/hidden/limit";
328 dragable { 314 dragable {
329 x: 1 1 0; 315 x: 1 1 0;
330 y: 0 0 0; 316 y: 0 0 0;
331 confine: "bg"; 317 confine: "elm.swallow.bar";
332 } 318 }
333 description { state: "default" 0.0; 319 description { state: "default" 0.0;
334 min: 0 24; 320 min: 0 24;
335 max: 0 24; 321 max: 0 24;
336 fixed: 1 1; 322 fixed: 1 1;
337 rel1 { 323 rel1 {
338 relative: 0.5 0.0; 324 relative: 0.5 0.5;
339 to_x: "bg"; 325 to: "elm.swallow.bar";
340 } 326 }
341 rel2 { 327 rel2 {
342 relative: 0.5 1.0; 328 relative: 0.5 0.5;
343 to_x: "bg"; 329 to: "elm.swallow.bar";
344 } 330 }
345 color: DARKNESS_BUTTON_BLUE 100; 331 color: DARKNESS_BUTTON_BLUE 100;
346 } 332 }
@@ -491,7 +477,7 @@ group { name: "elm/slider/hidden/limit";
491 477
492 group { name: "elm/slider/vertical/default"; 478 group { name: "elm/slider/vertical/default";
493 images { 479 images {
494 image: "slider_bar_v.png" COMP; 480 image: "scroll_border_v.png" COMP;
495 image: "frame_label_under.png" COMP; 481 image: "frame_label_under.png" COMP;
496 } 482 }
497 parts { 483 parts {
@@ -500,13 +486,14 @@ group { name: "elm/slider/hidden/limit";
500 description { state: "default" 0.0; 486 description { state: "default" 0.0;
501 max: 6 99999; 487 max: 6 99999;
502 min: 6 0; 488 min: 6 0;
503 rel1 { to: "bg"; 489 rel1 { to: "elm.swallow.bar";
504 offset: 1 0; 490 offset: -1 -1;
505 } 491 }
506 rel2 { to: "bg"; 492 rel2 { to: "elm.swallow.bar";
507 offset: -2 -1; 493 offset: 2 2;
508 } 494 }
509 image.normal: "slider_bar_v.png"; 495 image.normal: "scroll_border_v.png";
496 image.border: 1 1 4 4;
510 fill.smooth: 0; 497 fill.smooth: 0;
511 } 498 }
512 } 499 }
@@ -515,12 +502,12 @@ group { name: "elm/slider/hidden/limit";
515 mouse_events: 0; 502 mouse_events: 0;
516 description { state: "default" 0.0; 503 description { state: "default" 0.0;
517 fixed: 1 1; 504 fixed: 1 1;
518 rel1.to: "base"; 505 rel1.to_x: "base";
519 rel2 { 506 rel1.to_y: "elm.swallow.bar";
520 to_x: "base"; 507 rel1.offset: 1 0;
521 to_y: "elm.dragable.slider"; 508 rel2.to_x: "base";
522 relative: 1.0 0.5; 509 rel2.to_y: "elm.dragable.slider";
523 } 510 rel2.offset: -2 -1;
524 color: DARKNESS_BUTTON_BLUE 200; 511 color: DARKNESS_BUTTON_BLUE 200;
525 } 512 }
526 description { state: "inverted" 0.0; 513 description { state: "inverted" 0.0;
@@ -536,17 +523,6 @@ group { name: "elm/slider/hidden/limit";
536 visible: 0; 523 visible: 0;
537 } 524 }
538 } 525 }
539 part { name: "bg";
540 type: RECT;
541 mouse_events: 0;
542 scale: 1;
543 description { state: "default" 0.0;
544 visible: 0;
545 rel1.to: "elm.swallow.bar";
546 rel2.to: "elm.swallow.bar";
547 color: 0 0 0 0;
548 }
549 }
550 part { name: "elm.swallow.bar"; 526 part { name: "elm.swallow.bar";
551 type: SWALLOW; 527 type: SWALLOW;
552 scale: 1; 528 scale: 1;
@@ -735,19 +711,19 @@ group { name: "elm/slider/hidden/limit";
735 dragable { 711 dragable {
736 x: 0 0 0; 712 x: 0 0 0;
737 y: 1 1 0; 713 y: 1 1 0;
738 confine: "bg"; 714 confine: "elm.swallow.bar";
739 } 715 }
740 description { state: "default" 0.0; 716 description { state: "default" 0.0;
741 min: 24 0; 717 min: 24 0;
742 max: 24 0; 718 max: 24 0;
743 fixed: 1 1; 719 fixed: 1 1;
744 rel1 { 720 rel1 {
745 relative: 0.5 0.0; 721 relative: 0.5 0.0;
746 to_y: "bg"; 722 to_y: "elm.swallow.bar";
747 } 723 }
748 rel2 { 724 rel2 {
749 relative: 0.5 1.0; 725 relative: 0.5 1.0;
750 to_y: "bg"; 726 to_y: "elm.swallow.bar";
751 } 727 }
752 color: 0 0 0 0; 728 color: 0 0 0 0;
753 } 729 }
@@ -918,6 +894,7 @@ group { name: "elm/slider/hidden/limit";
918 } 894 }
919 part { name: "button"; 895 part { name: "button";
920 mouse_events: 0; 896 mouse_events: 0;
897 scale: 1;
921 description { state: "default" 0.0; 898 description { state: "default" 0.0;
922 fixed: 1 1; 899 fixed: 1 1;
923 min: 32 32; 900 min: 32 32;
@@ -925,7 +902,6 @@ group { name: "elm/slider/hidden/limit";
925 color: 175 175 175 255; 902 color: 175 175 175 255;
926 image { 903 image {
927 normal: "slider_button.png"; 904 normal: "slider_button.png";
928 border: 5 5 5 10;
929 } 905 }
930 fill.smooth: 0; 906 fill.smooth: 0;
931 } 907 }
@@ -942,10 +918,11 @@ group { name: "elm/slider/hidden/limit";
942 } 918 }
943 } 919 }
944 } 920 }
945 FOCUS_GLOW(0.0, 0.0, 0, 0, "button", 1.0, 1.0, -1, -1, "button") 921 FOCUS_GLOW(0.2, 0.2, 0, 0, "button", 0.7, 0.7, -1, -1, "button")
946 part { 922 part {
947 name: "slider_glow"; 923 name: "slider_glow";
948 mouse_events: 0; 924 mouse_events: 0;
925 scale: 1;
949 description { 926 description {
950 state: "default" 0.0; 927 state: "default" 0.0;
951 color: 255 255 255 0; 928 color: 255 255 255 0;