summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiscomfitor <michael.blumenkrantz@gmail.com>2013-12-29 19:39:23 -0500
committerdiscomfitor <michael.blumenkrantz@gmail.com>2013-12-29 19:41:27 -0500
commit641cc77b317e6caff9f9d7c6c5d8831d5e315474 (patch)
tree455d499c7b57c9df2e37fae4e0e47724849d3956
parent6078299b8d6560a167bb95cc3aa8c2fd821c8930 (diff)
fix scroller appearance to not be as shitty and match e theme better
-rw-r--r--elm/darkness-desktop.edc165
-rw-r--r--elm/images/ibar_bg_v.pngbin0 -> 183 bytes
-rw-r--r--elm/images/scroll_border_h.pngbin0 -> 130 bytes
-rw-r--r--elm/images/scroll_border_v.pngbin0 -> 130 bytes
4 files changed, 94 insertions, 71 deletions
diff --git a/elm/darkness-desktop.edc b/elm/darkness-desktop.edc
index f88258e..e1a7709 100644
--- a/elm/darkness-desktop.edc
+++ b/elm/darkness-desktop.edc
@@ -12,6 +12,8 @@ externals.external: "elm";
12 image: "scrollbar_button_down1.png" COMP; \ 12 image: "scrollbar_button_down1.png" COMP; \
13 image: "scrollbar_button_right1.png" COMP; \ 13 image: "scrollbar_button_right1.png" COMP; \
14 image: "scrollbar_button_left1.png" COMP; \ 14 image: "scrollbar_button_left1.png" COMP; \
15 image: "scroll_border_v.png" COMP; \
16 image: "scroll_border_h.png" COMP; \
15 } \ 17 } \
16 script { \ 18 script { \
17 public sbvis_v, sbvis_h; \ 19 public sbvis_v, sbvis_h; \
@@ -64,6 +66,27 @@ externals.external: "elm";
64 } \ 66 } \
65 } \ 67 } \
66 } \ 68 } \
69 part { \
70 name: "sb_vbar_runner"; \
71 clip_to: "sb_vbar_clip"; \
72 mouse_events: 0; \
73 description { \
74 state: "default" 0.0; \
75 rel1 { \
76 to: "sb_vbar_a1"; \
77 } \
78 rel2 { \
79 to: "sb_vbar_a2"; \
80 } \
81 image { \
82 normal: "scroll_border_v.png"; \
83 border: 1 1 4 4; \
84 } \
85 fill { \
86 smooth: 0; \
87 } \
88 } \
89 } \
67 part { name: "sb_vbar_p1"; \ 90 part { name: "sb_vbar_p1"; \
68 type: RECT; \ 91 type: RECT; \
69 mouse_events: 1; \ 92 mouse_events: 1; \
@@ -285,6 +308,27 @@ externals.external: "elm";
285 } \ 308 } \
286 } \ 309 } \
287 } \ 310 } \
311 part { \
312 name: "sb_hbar_runner"; \
313 clip_to: "sb_hbar_clip"; \
314 mouse_events: 0; \
315 description { \
316 state: "default" 0.0; \
317 rel1 { \
318 to: "sb_hbar_a1"; \
319 } \
320 rel2 { \
321 to: "sb_hbar_a2"; \
322 } \
323 image { \
324 normal: "scroll_border_h.png"; \
325 border: 4 4 1 1; \
326 } \
327 fill { \
328 smooth: 0; \
329 } \
330 } \
331 } \
288 part { name: "sb_hbar_over1"; \ 332 part { name: "sb_hbar_over1"; \
289 clip_to: "sb_hbar_clip"; \ 333 clip_to: "sb_hbar_clip"; \
290 mouse_events: 0; \ 334 mouse_events: 0; \
@@ -650,7 +694,6 @@ collections {
650 group { name: "elm/scroller/base/default"; 694 group { name: "elm/scroller/base/default";
651 alias: "elm/list/base/default"; 695 alias: "elm/list/base/default";
652 alias: "elm/genlist/base/default"; 696 alias: "elm/genlist/base/default";
653 alias: "elm/carousel/base/default";
654 alias: "elm/gengrid/base/default"; 697 alias: "elm/gengrid/base/default";
655 698
656 data { 699 data {
@@ -658,18 +701,23 @@ collections {
658 } 701 }
659 702
660 images { 703 images {
661 image: "shelf_inset.png" COMP;
662 image: "entry_over.png" COMP; 704 image: "entry_over.png" COMP;
705 image: "ibar_bg_v.png" COMP;
663 } 706 }
664 707
665 parts { 708 parts {
666 part { name: "bg"; 709 part { name: "bg";
667 type: RECT;
668 mouse_events: 0; 710 mouse_events: 0;
669 description { state: "default" 0.0; 711 description { state: "default" 0.0;
670 rel1.offset: 1 1; 712 rel1.offset: -1 -1;
671 rel2.offset: -2 -2; 713 rel2.offset: -2 -2;
672 color: 255 255 255 0; 714 image {
715 normal: "ibar_bg_v.png";
716 border: 7 7 7 7;
717 }
718 fill {
719 smooth : 0;
720 }
673 } 721 }
674 } 722 }
675 part { name: "clipper"; 723 part { name: "clipper";
@@ -692,17 +740,6 @@ collections {
692 } 740 }
693 } 741 }
694 } 742 }
695 part { name: "conf_over";
696 mouse_events: 0;
697 description { state: "default" 0.0;
698 image {
699 normal: "shelf_inset.png";
700 border: 7 7 7 7;
701 middle: 0;
702 }
703 fill.smooth: 0;
704 }
705 }
706 part { name: "focus_highlight"; 743 part { name: "focus_highlight";
707 mouse_events: 0; 744 mouse_events: 0;
708 description { state: "default" 0.0; 745 description { state: "default" 0.0;
@@ -732,18 +769,24 @@ collections {
732 } 769 }
733 770
734 images { 771 images {
735 image: "shelf_inset.png" COMP;
736 image: "entry_over.png" COMP; 772 image: "entry_over.png" COMP;
773 image: "ibar_bg_v.png" COMP;
737 } 774 }
738 775
739 parts { 776 parts {
740 part { name: "bg"; 777 part { name: "bg";
741 type: RECT;
742 mouse_events: 0; 778 mouse_events: 0;
743 description { state: "default" 0.0; 779 description { state: "default" 0.0;
744 rel1.offset: 1 1; 780 rel1.offset: -1 -1;
745 rel2.offset: -2 -2; 781 rel2.offset: -2 -2;
746 color: 0 0 0 255; 782 image {
783 normal: "ibar_bg_v.png";
784 border: 7 7 7 7;
785 }
786 fill {
787 smooth : 0;
788 }
789
747 } 790 }
748 } 791 }
749 part { name: "clipper"; 792 part { name: "clipper";
@@ -830,17 +873,6 @@ collections {
830 } 873 }
831 } 874 }
832 } 875 }
833 part { name: "conf_over";
834 mouse_events: 0;
835 description { state: "default" 0.0;
836 image {
837 normal: "shelf_inset.png";
838 border: 7 7 7 7;
839 middle: 0;
840 }
841 fill.smooth: 0;
842 }
843 }
844 part { name: "focus_highlight"; 876 part { name: "focus_highlight";
845 mouse_events: 0; 877 mouse_events: 0;
846 description { state: "default" 0.0; 878 description { state: "default" 0.0;
@@ -892,7 +924,6 @@ collections {
892 action: STATE_SET "enabled" 0.0; 924 action: STATE_SET "enabled" 0.0;
893 transition: ACCELERATE 0.3; 925 transition: ACCELERATE 0.3;
894 target: "focus_highlight"; 926 target: "focus_highlight";
895 target: "conf_over";
896 } 927 }
897 program { name: "highlight_hide"; 928 program { name: "highlight_hide";
898 signal: "elm,action,focus_highlight,hide"; 929 signal: "elm,action,focus_highlight,hide";
@@ -900,7 +931,6 @@ collections {
900 action: STATE_SET "default" 0.0; 931 action: STATE_SET "default" 0.0;
901 transition: DECELERATE 0.3; 932 transition: DECELERATE 0.3;
902 target: "focus_highlight"; 933 target: "focus_highlight";
903 target: "conf_over";
904 } 934 }
905 } 935 }
906 } 936 }
@@ -908,7 +938,6 @@ collections {
908 group { name: "elm/photocam/base/default"; 938 group { name: "elm/photocam/base/default";
909 939
910 images { 940 images {
911 image: "shelf_inset.png" COMP;
912 image: "busy-1.png" COMP; 941 image: "busy-1.png" COMP;
913 image: "busy-2.png" COMP; 942 image: "busy-2.png" COMP;
914 image: "busy-3.png" COMP; 943 image: "busy-3.png" COMP;
@@ -918,14 +947,21 @@ collections {
918 image: "busy-7.png" COMP; 947 image: "busy-7.png" COMP;
919 image: "busy-8.png" COMP; 948 image: "busy-8.png" COMP;
920 image: "busy-9.png" COMP; 949 image: "busy-9.png" COMP;
950 image: "ibar_bg_v.png" COMP;
921 } 951 }
922 parts { 952 parts {
923 part { name: "bg"; 953 part { name: "bg";
924 type: RECT;
925 description { state: "default" 0.0; 954 description { state: "default" 0.0;
926 rel1.offset: 1 1; 955 rel1.offset: -1 -1;
927 rel2.offset: -2 -2; 956 rel2.offset: -2 -2;
928 color: 255 255 255 0; 957 image {
958 normal: "ibar_bg_v.png";
959 border: 7 7 7 7;
960 }
961 fill {
962 smooth : 0;
963 }
964
929 } 965 }
930 } 966 }
931 part { name: "clipper"; 967 part { name: "clipper";
@@ -986,19 +1022,6 @@ collections {
986 } 1022 }
987 } 1023 }
988 } 1024 }
989 part { name: "conf_over";
990 mouse_events: 0;
991 description { state: "default" 0.0;
992 rel1.offset: 0 0;
993 rel2.offset: -1 -1;
994 image {
995 normal: "shelf_inset.png";
996 border: 7 7 7 7;
997 middle: 0;
998 }
999 fill.smooth : 0;
1000 }
1001 }
1002 SCROLLBARS_ADD() 1025 SCROLLBARS_ADD()
1003 } 1026 }
1004 programs { 1027 programs {
@@ -1035,7 +1058,7 @@ collections {
1035 /////////////////////////////////////////////////////////////////////////////// 1058 ///////////////////////////////////////////////////////////////////////////////
1036 group { name: "elm/map/base/default"; 1059 group { name: "elm/map/base/default";
1037 images { 1060 images {
1038 image: "shelf_inset.png" COMP; 1061 image: "ibar_bg_v.png" COMP;
1039 image: "busy-1.png" COMP; 1062 image: "busy-1.png" COMP;
1040 image: "busy-2.png" COMP; 1063 image: "busy-2.png" COMP;
1041 image: "busy-3.png" COMP; 1064 image: "busy-3.png" COMP;
@@ -1048,11 +1071,17 @@ collections {
1048 } 1071 }
1049 parts { 1072 parts {
1050 part { name: "bg"; 1073 part { name: "bg";
1051 type: RECT;
1052 description { state: "default" 0.0; 1074 description { state: "default" 0.0;
1053 rel1.offset: 1 1; 1075 rel1.offset: -1 -1;
1054 rel2.offset: -2 -2; 1076 rel2.offset: -2 -2;
1055 color: 255 255 255 0; 1077 image {
1078 normal: "ibar_bg_v.png";
1079 border: 7 7 7 7;
1080 }
1081 fill {
1082 smooth : 0;
1083 }
1084
1056 } 1085 }
1057 } 1086 }
1058 part { name: "clipper"; 1087 part { name: "clipper";
@@ -1113,19 +1142,6 @@ collections {
1113 } 1142 }
1114 } 1143 }
1115 } 1144 }
1116 part { name: "conf_over";
1117 mouse_events: 0;
1118 description { state: "default" 0.0;
1119 rel1.offset: 0 0;
1120 rel2.offset: -1 -1;
1121 image {
1122 normal: "shelf_inset.png";
1123 border: 7 7 7 7;
1124 middle: 0;
1125 }
1126 fill.smooth : 0;
1127 }
1128 }
1129 SCROLLBARS_ADD() 1145 SCROLLBARS_ADD()
1130 } 1146 }
1131 programs { 1147 programs {
@@ -1165,14 +1181,21 @@ collections {
1165 } 1181 }
1166 images { 1182 images {
1167 image: "entry_over.png" COMP; 1183 image: "entry_over.png" COMP;
1184 image: "ibar_bg_v.png" COMP;
1168 } 1185 }
1169 parts { 1186 parts {
1170 part { name: "bg"; 1187 part { name: "bg";
1171 type: RECT;
1172 description { state: "default" 0.0; 1188 description { state: "default" 0.0;
1173 rel1.offset: 2 2; 1189 rel1.offset: -1 -1;
1174 rel2.offset: -3 -3; 1190 rel2.offset: -2 -2;
1175 color: 255 255 255 0; 1191 image {
1192 normal: "ibar_bg_v.png";
1193 border: 7 7 7 7;
1194 }
1195 fill {
1196 smooth : 0;
1197 }
1198
1176 } 1199 }
1177 } 1200 }
1178 part { name: "clipper"; 1201 part { name: "clipper";
diff --git a/elm/images/ibar_bg_v.png b/elm/images/ibar_bg_v.png
new file mode 100644
index 0000000..395b8ed
--- /dev/null
+++ b/elm/images/ibar_bg_v.png
Binary files differ
diff --git a/elm/images/scroll_border_h.png b/elm/images/scroll_border_h.png
new file mode 100644
index 0000000..4daead5
--- /dev/null
+++ b/elm/images/scroll_border_h.png
Binary files differ
diff --git a/elm/images/scroll_border_v.png b/elm/images/scroll_border_v.png
new file mode 100644
index 0000000..0ed39d6
--- /dev/null
+++ b/elm/images/scroll_border_v.png
Binary files differ