raster pushed a commit to branch master.
commit 97ade5bd047e642bc92a4bcd8a884a84aecf9732
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Fri Jul 26 19:57:03 2013 +0900
fix up thumb to have flush shadow and border, with noframe of course
having invisible bg and shadow.
---
edje/edc/elm/thumb.edc | 153 +++++++++----------------------------------------
edje/img/frame_1.png | Bin 357 -> 0 bytes
edje/img/frame_2.png | Bin 644 -> 0 bytes
3 files changed, 27 insertions(+), 126 deletions(-)
diff --git a/edje/edc/elm/thumb.edc b/edje/edc/elm/thumb.edc
index 1639130..f1fd361 100644
--- a/edje/edc/elm/thumb.edc
+++ b/edje/edc/elm/thumb.edc
@@ -1,42 +1,33 @@
group { name: "elm/thumb/base/default";
- images {
- image: "frame_1.png" COMP;
- image: "frame_2.png" COMP;
- image: "knob_round_busy.png" COMP;
- image: "glow_round_corners.png" COMP;
- }
+ images.image: "knob_round_busy.png" COMP;
+ images.image: "glow_round_corners.png" COMP;
+ images.image: "shadow_square_tiny.png" COMP;
parts {
- part { name: "base0";
- type: RECT;
- mouse_events: 0;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "over";
- rel2.to: "over";
- color: 64 64 64 255;
+ rel1.offset: -3 -2;
+ rel1.to: "bg";
+ rel2.offset: 3 4;
+ rel2.to: "bg";
+ image.normal: "shadow_square_tiny.png";
+ image.border: 6 6 6 6;
+ fill.smooth: 0;
}
}
- part { name: "base";
- mouse_events: 0;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- image {
- normal: "frame_2.png";
- border: 5 5 32 26;
- middle: 0;
- }
- fill.smooth : 0;
+ rel1.to: "elm.swallow.content";
+ rel2.to: "elm.swallow.content";
+ color: 64 64 64 255;
}
}
- part { name: "clip";
- mouse_events: 0;
- type: RECT;
+ part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- color: 255 255 255 255;
+ rel1.to: "elm.swallow.content";
+ rel2.to: "elm.swallow.content";
}
}
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
rel1.offset: 4 4;
@@ -60,11 +51,8 @@ group { name: "elm/thumb/base/default";
image.normal: "knob_round_busy.png";
min: 40 40;
max: 40 40;
- rel1.relative: 0.0 1.0;
- rel1.offset: 7 -8;
- rel2.relative: 0.0 1.0;
- rel2.offset: 7 -8;
- align: 0.0 1.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
}
}
part { name: "knob_spinner"; mouse_events: 0;
@@ -83,19 +71,6 @@ group { name: "elm/thumb/base/default";
map.rotation.z: 360;
}
}
- part { name: "over";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- image {
- normal: "frame_1.png";
- border: 2 2 28 22;
- middle: 0;
- }
- fill.smooth: 0;
- }
- }
}
programs {
program { name: "spin";
@@ -140,92 +115,18 @@ group { name: "elm/thumb/base/default";
}
group { name: "elm/thumb/base/noframe";
+ inherit: "elm/thumb/base/default";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
- description { state: "default" 0.0;
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- }
- }
- part { name: "busy_clip"; type: RECT;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
visible: 0;
- color: 255 255 255 0;
- }
- description { state: "active" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "knob"; mouse_events: 0;
- clip_to: "busy_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "knob_round_busy.png";
- min: 40 40;
- max: 40 40;
- rel1.relative: 0.0 1.0;
- rel1.offset: 7 -8;
- rel2.relative: 0.0 1.0;
- rel2.offset: 7 -8;
- align: 0.0 1.0;
}
}
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
+ part { name: "bg"; mouse_events: 0;
description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- map.rotation.z: 360;
- }
- }
- programs {
- program { name: "spin";
- signal: "elm,state,pulse,start";
- source: "elm";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin";
- }
- program { name: "pulse_start";
- signal: "elm,state,pulse,start";
- source: "elm";
- action: STATE_SET "active" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program { name: "pulse_stop";
- signal: "elm,state,pulse,stop";
- source: "elm";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
+ rel1.offset: 0 0;
+ rel2.offset: -1 -1;
+ visible: 0;
}
}
}
diff --git a/edje/img/frame_1.png b/edje/img/frame_1.png
deleted file mode 100644
index eb00ef0..0000000
Binary files a/edje/img/frame_1.png and /dev/null differ
diff --git a/edje/img/frame_2.png b/edje/img/frame_2.png
deleted file mode 100644
index 5c54f30..0000000
Binary files a/edje/img/frame_2.png and /dev/null differ
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
