raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=6c789ffc92742592a77a3d5927bc0d35ad234b85
commit 6c789ffc92742592a77a3d5927bc0d35ad234b85
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Oct 17 12:59:35 2013 +0900
double progress looks nicer now.
---
edje/edc/elm/progress.edc | 68 ++--------------------
edje/img/inset_bar_horiz_glow_base_double.png | Bin 13825 -> 3235 bytes
edje/img/inset_bar_horiz_glow_inv_base_double.png | Bin 15274 -> 3213 bytes
edje/img/inset_bar_vert_glow_base_double.png | Bin 17543 -> 3817 bytes
edje/img/inset_bar_vert_glow_inv_base_double.png | Bin 17747 -> 3775 bytes
5 files changed, 4 insertions(+), 64 deletions(-)
diff --git a/edje/edc/elm/progress.edc b/edje/edc/elm/progress.edc
index a9fc46e..d8be3d3 100644
--- a/edje/edc/elm/progress.edc
+++ b/edje/edc/elm/progress.edc
@@ -1262,6 +1262,7 @@ group { name: "elm/progressbar/horizontal/double";
}
}
part { name: "bar1";
+ insert_after: "barend";
clip_to: "fract_clip";
scale: 1;
description { state: "default" 0.0;
@@ -1274,6 +1275,7 @@ group { name: "elm/progressbar/horizontal/double";
image.normal: "inset_bar_horiz_glow_base_double.png";
image.border: 0 72 0 0;
image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 51 153 255 128;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
@@ -1285,36 +1287,6 @@ group { name: "elm/progressbar/horizontal/double";
image.border: 72 0 0 0;
}
}
- part { name: "light1";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
- max: 36 11;
- rel1.to_x: "bar1";
- rel1.to_y: "bar1";
- rel1.relative: 0.0 (26/96);
- rel2.to_x: "barend1";
- rel2.to_y: "bar1";
- rel2.relative: 0.2 ((26+44)/96);
- align: 1.0 0.0;
- image.normal: "inset_bar_horiz_glow_light.png";
- image.border: 0 20 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
- inherit: "default" 0.0;
- rel1.to_x: "barend1";
- rel1.to_y: "bar1";
- rel1.relative: 0.8 (26/96);
- rel2.to_x: "bar1";
- rel2.to_y: "bar1";
- rel2.relative: 1.0 ((26+44)/96);
- align: 0.0 0.0;
- image.normal: "inset_bar_horiz_glow_inv_light.png";
- image.border: 20 0 0 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -1325,7 +1297,6 @@ group { name: "elm/progressbar/horizontal/double";
target: "barend";
target: "barend1";
target: "light";
- target: "light1";
}
program
{ name: "inverted-off";
@@ -1336,7 +1307,6 @@ group { name: "elm/progressbar/horizontal/double";
target: "barend";
target: "barend1";
target: "light";
- target: "light1";
}
}
}
@@ -1381,6 +1351,7 @@ group { name: "elm/progressbar/vertical/double";
}
}
part { name: "bar1";
+ insert_after: "barend";
clip_to: "fract_clip";
scale: 1;
description { state: "default" 0.0;
@@ -1393,6 +1364,7 @@ group { name: "elm/progressbar/vertical/double";
image.normal: "inset_bar_vert_glow_base_double.png";
image.border: 0 0 0 72;
image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 51 153 255 128;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
@@ -1404,36 +1376,6 @@ group { name: "elm/progressbar/vertical/double";
image.border: 0 0 72 0;
}
}
- part { name: "light1";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
- max: 11 36;
- rel1.to_y: "bar1";
- rel1.to_x: "bar1";
- rel1.relative: (26/96) 0.0;
- rel2.to_y: "barend1";
- rel2.to_x: "bar1";
- rel2.relative: ((26+44)/96) 0.2;
- align: 0.0 1.0;
- image.normal: "inset_bar_vert_glow_light.png";
- image.border: 0 0 0 20;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
- inherit: "default" 0.0;
- rel1.to_y: "barend1";
- rel1.to_x: "bar1";
- rel1.relative: (26/96) 0.8;
- rel2.to_y: "bar1";
- rel2.to_x: "bar1";
- rel2.relative: ((26+44)/96) 1.0;
- align: 0.0 0.0;
- image.normal: "inset_bar_vert_glow_inv_light.png";
- image.border: 0 0 20 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -1444,7 +1386,6 @@ group { name: "elm/progressbar/vertical/double";
target: "light";
target: "bar1";
target: "barend1";
- target: "light1";
}
program { name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
@@ -1454,7 +1395,6 @@ group { name: "elm/progressbar/vertical/double";
target: "light";
target: "bar1";
target: "barend1";
- target: "light1";
}
}
}
diff --git a/edje/img/inset_bar_horiz_glow_base_double.png
b/edje/img/inset_bar_horiz_glow_base_double.png
index 7963de5..e57e676 100644
Binary files a/edje/img/inset_bar_horiz_glow_base_double.png and
b/edje/img/inset_bar_horiz_glow_base_double.png differ
diff --git a/edje/img/inset_bar_horiz_glow_inv_base_double.png
b/edje/img/inset_bar_horiz_glow_inv_base_double.png
index 2beff29..f2b986c 100644
Binary files a/edje/img/inset_bar_horiz_glow_inv_base_double.png and
b/edje/img/inset_bar_horiz_glow_inv_base_double.png differ
diff --git a/edje/img/inset_bar_vert_glow_base_double.png
b/edje/img/inset_bar_vert_glow_base_double.png
index 7443c21..e71022e 100644
Binary files a/edje/img/inset_bar_vert_glow_base_double.png and
b/edje/img/inset_bar_vert_glow_base_double.png differ
diff --git a/edje/img/inset_bar_vert_glow_inv_base_double.png
b/edje/img/inset_bar_vert_glow_inv_base_double.png
index 9e01ed0..919c623 100644
Binary files a/edje/img/inset_bar_vert_glow_inv_base_double.png and
b/edje/img/inset_bar_vert_glow_inv_base_double.png differ
--
