raster pushed a commit to branch master.
commit b03877f1c8e32c9f6dfa9fa31abd2d76d1ccd4af
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Wed Jul 31 18:53:44 2013 +0900
fixed actionslider text/shadows and some spacing/padding/sizing.
---
edje/dark.edc | 1 -
edje/edc/elm/actionslider.edc | 122 ++++++++++++++++++++----------------------
2 files changed, 59 insertions(+), 64 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index cf50df7..73203fd 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -40,7 +40,6 @@ collections {
#include "edc/elm/ctxpopup.edc"
//#include "edc/elm/multibuttonentry.edc"
#include "edc/elm/dayselector.edc"
-// XXX: fix gfx for actionslider - fix shadow under text (grey not blakc)
#include "edc/elm/actionslider.edc"
//#include "edc/elm/photocam.edc"
#include "edc/elm/tooltip.edc"
diff --git a/edje/edc/elm/actionslider.edc b/edje/edc/elm/actionslider.edc
index 57ec91c..ec8d3d2 100644
--- a/edje/edc/elm/actionslider.edc
+++ b/edje/edc/elm/actionslider.edc
@@ -1,41 +1,45 @@
group { name: "elm/actionslider/base/default";
-
- images {
- image: "bevel_in.png" COMP;
- image: "button_normal.png" COMP;
- image: "button_clicked.png" COMP;
- image: "glow_small.png" COMP;
- }
+ images.image: "bevel_in.png" COMP;
+ images.image: "button_normal.png" COMP;
+ images.image: "button_clicked.png" COMP;
+ images.image: "glow_small.png" COMP;
+ images.image: "inset_shadow.png" COMP;
parts {
- part { name: "base"; type: RECT; mouse_events: 0;
- scale: 1;
+ part { name: "bg"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- min: 75 25;
- color: 24 24 24 255;
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ min: 48 10;
+ color: 48 48 48 255;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: 64 64 64 255;
}
}
+ part { name: "shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "inset_shadow.png";
+ image.border: 5 5 7 3;
+ image.middle: 0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ fill.smooth: 0;
+ color: 255 255 255 128;
+ }
+ }
part { name: "inset"; mouse_events: 0;
- scale: 1;
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image {
- normal: "bevel_in.png";
- border: 1 1 1 1;
- middle: 0;
- }
+ image.normal: "bevel_in.png";
+ image.border: 1 1 1 1;
+ image.middle: 0;
fill.smooth: 0;
}
}
- part { name: "icon.dragable.area";
- type: SPACER;
+ part { name: "icon.dragable.area"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
+ rel1.to: "bg";
+ rel2.to: "bg";
}
}
part { name: "elm.text.left"; type: TEXT; mouse_events: 0;
@@ -43,7 +47,7 @@ group { name: "elm/actionslider/base/default";
scale: 1;
description { state: "default" 0.0;
color: 255 255 255 255;
- color3: 200 200 200 100;
+ color3: 0 0 0 128;
color_class: "button_text";
text { font: FN; size: 10;
align: 0.05 0.5;
@@ -53,7 +57,7 @@ group { name: "elm/actionslider/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 200 200 200 255;
+ color: 21 21 21 255;
color3: 255 255 255 25;
color_class: "button_text_disabled";
}
@@ -63,7 +67,7 @@ group { name: "elm/actionslider/base/default";
scale: 1;
description { state: "default" 0.0;
color: 255 255 255 255;
- color3: 200 200 200 100;
+ color3: 0 0 0 128;
color_class: "check_off_text";
text { font: FN; size: 10;
align: 0.5 0.5;
@@ -73,8 +77,8 @@ group { name: "elm/actionslider/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 200 200 200 255;
- color3: 155 155 155 25;
+ color: 21 21 21 255;
+ color3: 255 255 255 25;
color_class: "button_text_disabled";
}
}
@@ -83,7 +87,7 @@ group { name: "elm/actionslider/base/default";
scale: 1;
description { state: "default" 0.0;
color: 255 255 255 255;
- color3: 200 200 200 100;
+ color3: 0 0 0 128;
color_class: "check_off_text";
text { font: FN; size: 10;
align: 0.95 0.5;
@@ -93,7 +97,7 @@ group { name: "elm/actionslider/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 200 200 200 255;
+ color: 21 21 21 255;
color3: 255 255 255 25;
color_class: "button_text_disabled";
}
@@ -102,7 +106,7 @@ group { name: "elm/actionslider/base/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 50 25;
+ min: 40 10;
align: 0.5 0.5;
rel1.to: "icon.dragable.area";
rel2 {
@@ -116,13 +120,11 @@ group { name: "elm/actionslider/base/default";
y: 0 0 0;
}
}
- part { name: "elm.drag_button";
- type: RECT;
- mouse_events: 1;
+ part { name: "elm.drag_button"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 50 25;
- color: 255 255 255 0;
+ min: 40 10;
+ color: 0 0 0 0;
rel1.to_x: "elm.drag_button_base";
rel1.to_y: "icon.dragable.area";
rel2.to_x: "elm.drag_button_base";
@@ -175,11 +177,11 @@ group { name: "elm/actionslider/base/default";
description { state: "default" 0.0;
rel1 {
to: "elm.drag_button";
- offset: 5 0;
+ offset: 5 2;
}
rel2 {
to: "elm.drag_button";
- offset: -5 0;
+ offset: -5 -3;
}
color: 255 255 255 255;
color3: 0 0 0 128;
@@ -193,7 +195,7 @@ group { name: "elm/actionslider/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 200 200 200 255;
+ color: 21 21 21 255;
color3: 255 255 255 25;
color_class: "button_text_disabled";
}
@@ -211,9 +213,8 @@ group { name: "elm/actionslider/base/default";
}
}
programs {
- program { name: "elm.drag_button,mouse,up";
- signal: "mouse,up,1";
- source: "elm.drag_button";
+ program {
+ signal: "mouse,up,1"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm.drag_button,mouse,up" "";
after: "button_unclick_anim";
}
@@ -222,9 +223,8 @@ group { name: "elm/actionslider/base/default";
target: "drag_button";
target: "glow_button";
}
- program { name: "elm.drag_button,mouse,down";
- signal: "mouse,down,1*";
- source: "elm.drag_button";
+ program {
+ signal: "mouse,down,1*"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm.drag_button,mouse,down" "";
after: "button_click_anim";
}
@@ -233,25 +233,24 @@ group { name: "elm/actionslider/base/default";
target: "drag_button";
target: "glow_button";
}
- program { name: "elm.drag_button,mouse,move";
- signal: "mouse,move";
- source: "elm.drag_button_base";
+ program {
+ signal: "mouse,move"; source: "elm.drag_button_base";
action: SIGNAL_EMIT "elm.drag_button,mouse,move" "";
}
- program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
+ program {
+ signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
+ target: "bg";
target: "disabler";
target: "elm.text.left";
target: "elm.text.center";
target: "elm.text.right";
target: "elm.text.indicator";
}
- program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
+ program {
+ signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
+ target: "bg";
target: "disabler";
target: "elm.text.left";
target: "elm.text.center";
@@ -263,21 +262,18 @@ group { name: "elm/actionslider/base/default";
group { name: "elm/actionslider/base/bar";
inherit: "elm/actionslider/base/default";
-
- images {
- image: "horiz_glow_run_big.png" COMP;
- }
+ images.image: "horiz_glow_run_big.png" COMP;
parts {
part { name: "bar"; mouse_events: 0;
insert_before: "elm.drag_button_base";
description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 0 5;
+ rel1.to: "bg";
+ rel1.offset: 1 4;
rel2 {
- relative: 0 1;
- offset: 3 -7;
+ relative: 0.0 1.0;
+ offset: 3 -5;
to_x: "elm.drag_button_base";
- to_y: "base";
+ to_y: "bg";
}
image {
normal: "horiz_glow_run_big.png";
--
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
