discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f6c979266462d58bf56bb647b23af4b8f9875e22
commit f6c979266462d58bf56bb647b23af4b8f9875e22
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Tue Jun 16 16:28:59 2015 -0400
theme: migrate all e users of darken_rounded_square to new darken_square
image
nearly everything in e is square except for this, which was a holdover from
the
b&w theme. the new image looks more coherent with the rest of the square
look
image created by me, licensing to match rest of theme images
@feature
---
data/themes/Makefile.am | 1 +
data/themes/edc/edgebindings.edc | 6 +++---
data/themes/edc/fileman.edc | 6 +++---
data/themes/edc/ibar-ibox.edc | 16 ++++++++--------
data/themes/edc/ilist.edc | 10 +++++-----
data/themes/edc/notification.edc | 6 +++---
data/themes/img/darken_square.png | Bin 0 -> 430 bytes
7 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 63c9a63..58d649c 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -220,6 +220,7 @@ img/col_sel_end_top.png \
img/darken_rounded_square_half_h.png \
img/darken_rounded_square_half.png \
img/darken_rounded_square.png \
+img/darken_square.png \
img/day_left_normal.png \
img/day_left_press.png \
img/day_left_selected.png \
diff --git a/data/themes/edc/edgebindings.edc b/data/themes/edc/edgebindings.edc
index a54dad2..9bcffc6 100644
--- a/data/themes/edc/edgebindings.edc
+++ b/data/themes/edc/edgebindings.edc
@@ -2,7 +2,7 @@ group { name: "e/modules/conf_edgebindings/selection";
images.image: "inset_shadow.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "dot_pattern.png" COMP;
- images.image: "darken_rounded_square.png" COMP;
+ images.image: "darken_square.png" COMP;
images.image: "downlight_glow.png" COMP;
images.image: "downlight_glow_left.png" COMP;
images.image: "downlight_glow_right.png" COMP;
@@ -50,8 +50,8 @@ group { name: "e/modules/conf_edgebindings/selection";
rel1.to: "e.text.selection";
rel2.offset: 9 5;
rel2.to: "e.text.selection";
- image.normal: "darken_rounded_square.png";
- image.border: 15 15 15 15;
+ image.normal: "darken_square.png";
+ image.border: 6 6 6 6;
fill.smooth: 0;
fixed: 1 1;
}
diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc
index 70b1929..f4b0e30 100644
--- a/data/themes/edc/fileman.edc
+++ b/data/themes/edc/fileman.edc
@@ -868,7 +868,7 @@ group { name: "e/fileman/default/icon/fixed";
group { name: "e/fileman/desktop/icon/fixed";
inherit: "e/fileman/default/icon/fixed";
alias: "e/fileman/desktop/icon/variable";
- images.image: "darken_rounded_square.png" COMP;
+ images.image: "darken_square.png" COMP;
styles {
style { name: "fileman_icon_full";
base: "font="FN" font_size=10 text_class=fileman_icon align=center
color=#ff00ffff wrap=mixed style=shadow,bottom shadow_color=#00000080
align=center";
@@ -914,8 +914,8 @@ group { name: "e/fileman/desktop/icon/fixed";
rel1.to: "e.text.label";
rel2.offset: 7 7;
rel2.to: "label_min";
- image.normal: "darken_rounded_square.png";
- image.border: 15 15 15 15;
+ image.normal: "darken_square.png";
+ image.border: 6 6 6 6;
fill.smooth: 0;
fixed: 1 1;
}
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index 02664ae..3d11c05 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -165,7 +165,7 @@ group { name: "e/modules/ibox/icon";
}
group { name: "e/modules/ibar/menu";
- images.image: "darken_rounded_square.png" COMP;
+ images.image: "darken_square.png" COMP;
parts {
part { name: "sizer"; type: SPACER;
description { state: "default"; }
@@ -190,8 +190,8 @@ group { name: "e/modules/ibar/menu";
description { state: "default" 0.0;
rel1.to: "sizer";
rel2.to: "sizer";
- image.normal: "darken_rounded_square.png";
- image.border: 15 15 15 15;
+ image.normal: "darken_square.png";
+ image.border: 6 6 6 6;
}
}
part { name: "e.box"; type: BOX;
@@ -428,7 +428,7 @@ group { name: "e/modules/ibar/menu/item";
group { name: "e/modules/ibox/icon_overlay";
alias: "e/modules/ibar/icon_overlay";
- images.image: "darken_rounded_square.png" COMP;
+ images.image: "darken_square.png" COMP;
script {
public urgent;
}
@@ -497,12 +497,12 @@ group { name: "e/modules/ibox/icon_overlay";
}
part { name: "bevel"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: -10 -6;
+ rel1.offset: -9 -5;
rel1.to: "e.text.label";
- rel2.offset: 9 5;
+ rel2.offset: 8 4;
rel2.to: "e.text.label";
- image.normal: "darken_rounded_square.png";
- image.border: 15 15 15 15;
+ image.normal: "darken_square.png";
+ image.border: 6 6 6 6;
fill.smooth: 0;
fixed: 1 1;
color: 255 255 255 0;
diff --git a/data/themes/edc/ilist.edc b/data/themes/edc/ilist.edc
index 7bad83b..b6eae7c 100644
--- a/data/themes/edc/ilist.edc
+++ b/data/themes/edc/ilist.edc
@@ -1,5 +1,5 @@
group { name: "e/ilist";
- images.image: "darken_rounded_square.png" COMP;
+ images.image: "darken_square.png" COMP;
parts {
part { name: "typebuf_clip"; type: RECT;
description { state: "default" 0.0;
@@ -14,12 +14,12 @@ group { name: "e/ilist";
part { name: "bevel"; mouse_events: 0;
clip_to: "typebuf_clip";
description { state: "default" 0.0;
- rel1.offset: -15 -15;
+ rel1.offset: -6 -6;
rel1.to: "e.text.label";
- rel2.offset: 14 14;
+ rel2.offset: 5 5;
rel2.to: "e.text.label";
- image.normal: "darken_rounded_square.png";
- image.border: 15 15 15 15;
+ image.normal: "darken_square.png";
+ image.border: 6 6 6 6;
fill.smooth: 0;
}
}
diff --git a/data/themes/edc/notification.edc b/data/themes/edc/notification.edc
index 66564fb..ab5d525 100644
--- a/data/themes/edc/notification.edc
+++ b/data/themes/edc/notification.edc
@@ -12,7 +12,7 @@ group { name: "e/modules/notification/logo";
}
group { name: "e/modules/notification/main";
- images.image: "darken_rounded_square.png" COMP;
+ images.image: "darken_square.png" COMP;
images.image: "sym_close_light_normal.png" COMP;
images.image: "sym_close_light_selected.png" COMP;
data.item: "app_icon_max" "48 48";
@@ -47,8 +47,8 @@ group { name: "e/modules/notification/main";
parts {
part { name: "base";
description { state: "default" 0.0;
- image.normal: "darken_rounded_square.png";
- image.border: 15 15 15 15;
+ image.normal: "darken_square.png";
+ image.border: 6 6 6 6;
}
}
part { name: "titleclip"; type: RECT;
diff --git a/data/themes/img/darken_square.png
b/data/themes/img/darken_square.png
new file mode 100644
index 0000000..0bcc9ec
Binary files /dev/null and b/data/themes/img/darken_square.png differ
--
