discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=641cc77b317e6caff9f9d7c6c5d8831d5e315474
commit 641cc77b317e6caff9f9d7c6c5d8831d5e315474
Author: discomfitor <michael.blumenkra...@gmail.com>
Date: Sun Dec 29 19:39:23 2013 -0500
fix scroller appearance to not be as shitty and match e theme better
---
elm/darkness-desktop.edc | 165 +++++++++++++++++++++++------------------
elm/images/ibar_bg_v.png | Bin 0 -> 183 bytes
elm/images/scroll_border_h.png | Bin 0 -> 130 bytes
elm/images/scroll_border_v.png | Bin 0 -> 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";
image: "scrollbar_button_down1.png" COMP; \
image: "scrollbar_button_right1.png" COMP; \
image: "scrollbar_button_left1.png" COMP; \
+ image: "scroll_border_v.png" COMP; \
+ image: "scroll_border_h.png" COMP; \
} \
script { \
public sbvis_v, sbvis_h; \
@@ -64,6 +66,27 @@ externals.external: "elm";
} \
} \
} \
+ part { \
+ name: "sb_vbar_runner"; \
+ clip_to: "sb_vbar_clip"; \
+ mouse_events: 0; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { \
+ to: "sb_vbar_a1"; \
+ } \
+ rel2 { \
+ to: "sb_vbar_a2"; \
+ } \
+ image { \
+ normal: "scroll_border_v.png"; \
+ border: 1 1 4 4; \
+ } \
+ fill { \
+ smooth: 0; \
+ } \
+ } \
+ } \
part { name: "sb_vbar_p1"; \
type: RECT; \
mouse_events: 1; \
@@ -285,6 +308,27 @@ externals.external: "elm";
} \
} \
} \
+ part { \
+ name: "sb_hbar_runner"; \
+ clip_to: "sb_hbar_clip"; \
+ mouse_events: 0; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { \
+ to: "sb_hbar_a1"; \
+ } \
+ rel2 { \
+ to: "sb_hbar_a2"; \
+ } \
+ image { \
+ normal: "scroll_border_h.png"; \
+ border: 4 4 1 1; \
+ } \
+ fill { \
+ smooth: 0; \
+ } \
+ } \
+ } \
part { name: "sb_hbar_over1"; \
clip_to: "sb_hbar_clip"; \
mouse_events: 0; \
@@ -650,7 +694,6 @@ collections {
group { name: "elm/scroller/base/default";
alias: "elm/list/base/default";
alias: "elm/genlist/base/default";
- alias: "elm/carousel/base/default";
alias: "elm/gengrid/base/default";
data {
@@ -658,18 +701,23 @@ collections {
}
images {
- image: "shelf_inset.png" COMP;
image: "entry_over.png" COMP;
+ image: "ibar_bg_v.png" COMP;
}
parts {
part { name: "bg";
- type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 1 1;
+ rel1.offset: -1 -1;
rel2.offset: -2 -2;
- color: 255 255 255 0;
+ image {
+ normal: "ibar_bg_v.png";
+ border: 7 7 7 7;
+ }
+ fill {
+ smooth : 0;
+ }
}
}
part { name: "clipper";
@@ -692,17 +740,6 @@ collections {
}
}
}
- part { name: "conf_over";
- mouse_events: 0;
- description { state: "default" 0.0;
- image {
- normal: "shelf_inset.png";
- border: 7 7 7 7;
- middle: 0;
- }
- fill.smooth: 0;
- }
- }
part { name: "focus_highlight";
mouse_events: 0;
description { state: "default" 0.0;
@@ -732,18 +769,24 @@ collections {
}
images {
- image: "shelf_inset.png" COMP;
image: "entry_over.png" COMP;
+ image: "ibar_bg_v.png" COMP;
}
parts {
part { name: "bg";
- type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 1 1;
+ rel1.offset: -1 -1;
rel2.offset: -2 -2;
- color: 0 0 0 255;
+ image {
+ normal: "ibar_bg_v.png";
+ border: 7 7 7 7;
+ }
+ fill {
+ smooth : 0;
+ }
+
}
}
part { name: "clipper";
@@ -830,17 +873,6 @@ collections {
}
}
}
- part { name: "conf_over";
- mouse_events: 0;
- description { state: "default" 0.0;
- image {
- normal: "shelf_inset.png";
- border: 7 7 7 7;
- middle: 0;
- }
- fill.smooth: 0;
- }
- }
part { name: "focus_highlight";
mouse_events: 0;
description { state: "default" 0.0;
@@ -892,7 +924,6 @@ collections {
action: STATE_SET "enabled" 0.0;
transition: ACCELERATE 0.3;
target: "focus_highlight";
- target: "conf_over";
}
program { name: "highlight_hide";
signal: "elm,action,focus_highlight,hide";
@@ -900,7 +931,6 @@ collections {
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.3;
target: "focus_highlight";
- target: "conf_over";
}
}
}
@@ -908,7 +938,6 @@ collections {
group { name: "elm/photocam/base/default";
images {
- image: "shelf_inset.png" COMP;
image: "busy-1.png" COMP;
image: "busy-2.png" COMP;
image: "busy-3.png" COMP;
@@ -918,14 +947,21 @@ collections {
image: "busy-7.png" COMP;
image: "busy-8.png" COMP;
image: "busy-9.png" COMP;
+ image: "ibar_bg_v.png" COMP;
}
parts {
part { name: "bg";
- type: RECT;
description { state: "default" 0.0;
- rel1.offset: 1 1;
+ rel1.offset: -1 -1;
rel2.offset: -2 -2;
- color: 255 255 255 0;
+ image {
+ normal: "ibar_bg_v.png";
+ border: 7 7 7 7;
+ }
+ fill {
+ smooth : 0;
+ }
+
}
}
part { name: "clipper";
@@ -986,19 +1022,6 @@ collections {
}
}
}
- part { name: "conf_over";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- image {
- normal: "shelf_inset.png";
- border: 7 7 7 7;
- middle: 0;
- }
- fill.smooth : 0;
- }
- }
SCROLLBARS_ADD()
}
programs {
@@ -1035,7 +1058,7 @@ collections {
///////////////////////////////////////////////////////////////////////////////
group { name: "elm/map/base/default";
images {
- image: "shelf_inset.png" COMP;
+ image: "ibar_bg_v.png" COMP;
image: "busy-1.png" COMP;
image: "busy-2.png" COMP;
image: "busy-3.png" COMP;
@@ -1048,11 +1071,17 @@ collections {
}
parts {
part { name: "bg";
- type: RECT;
description { state: "default" 0.0;
- rel1.offset: 1 1;
+ rel1.offset: -1 -1;
rel2.offset: -2 -2;
- color: 255 255 255 0;
+ image {
+ normal: "ibar_bg_v.png";
+ border: 7 7 7 7;
+ }
+ fill {
+ smooth : 0;
+ }
+
}
}
part { name: "clipper";
@@ -1113,19 +1142,6 @@ collections {
}
}
}
- part { name: "conf_over";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- image {
- normal: "shelf_inset.png";
- border: 7 7 7 7;
- middle: 0;
- }
- fill.smooth : 0;
- }
- }
SCROLLBARS_ADD()
}
programs {
@@ -1165,14 +1181,21 @@ collections {
}
images {
image: "entry_over.png" COMP;
+ image: "ibar_bg_v.png" COMP;
}
parts {
part { name: "bg";
- type: RECT;
description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
- color: 255 255 255 0;
+ rel1.offset: -1 -1;
+ rel2.offset: -2 -2;
+ image {
+ normal: "ibar_bg_v.png";
+ border: 7 7 7 7;
+ }
+ fill {
+ smooth : 0;
+ }
+
}
}
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
Binary files /dev/null and b/elm/images/ibar_bg_v.png differ
diff --git a/elm/images/scroll_border_h.png b/elm/images/scroll_border_h.png
new file mode 100644
index 0000000..4daead5
Binary files /dev/null and b/elm/images/scroll_border_h.png differ
diff --git a/elm/images/scroll_border_v.png b/elm/images/scroll_border_v.png
new file mode 100644
index 0000000..0ed39d6
Binary files /dev/null and b/elm/images/scroll_border_v.png differ
--
