raster pushed a commit to branch master.
commit 6934ebdeb35de7409d56082abc4b52a47480d31e
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Jul 23 21:57:45 2013 +0900
add flush style for player.
---
edje/edc/elm/button.edc | 10 ++++++++
edje/edc/elm/icon.edc | 2 ++
edje/edc/elm/player.edc | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index 0ed55a6..2599764 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -688,6 +688,16 @@ group { name: "elm/button/base/media_player/prev/default";
alias: "elm/button/base/media_player/forward/default";
alias: "elm/button/base/media_player/next/default";
alias: "elm/button/base/media_player/info/default";
+
+ alias: "elm/button/base/media_player/prev/flush";
+ alias: "elm/button/base/media_player/rewind/flush";
+ alias: "elm/button/base/media_player/play/flush";
+ alias: "elm/button/base/media_player/pause/flush";
+ alias: "elm/button/base/media_player/stop/flush";
+ alias: "elm/button/base/media_player/forward/flush";
+ alias: "elm/button/base/media_player/next/flush";
+ alias: "elm/button/base/media_player/info/flush";
+
images.image: "shadow_inset_bevels.png" COMP;
images.image: "shadow_angled_in_sides.png" COMP;
parts {
diff --git a/edje/edc/elm/icon.edc b/edje/edc/elm/icon.edc
index f052a37..183c0b1 100644
--- a/edje/edc/elm/icon.edc
+++ b/edje/edc/elm/icon.edc
@@ -61,6 +61,7 @@ IC("media_player/stop", "icon_stop.png", 16, 0);
#define IC(Name, File, Min, Max) \
group { name: "elm/icon/"##Name##"/default/default"; min: Min Min; max: Max
Max; \
+ alias: "elm/icon/"##Name##"/default/flush"; \
images.image: File COMP; parts { \
part { name: "hi"; \
description { \
@@ -79,3 +80,4 @@ IC("media_player/prev", "icon_prev_mono.png", 16, 0);
IC("media_player/rewind", "icon_rewind_mono.png", 16, 0);
IC("media_player/stop", "icon_stop_mono.png", 16, 0);
#undef IC
+
diff --git a/edje/edc/elm/player.edc b/edje/edc/elm/player.edc
index 021a7ff..6623298 100644
--- a/edje/edc/elm/player.edc
+++ b/edje/edc/elm/player.edc
@@ -109,7 +109,8 @@ group { name: "elm/player/base/default";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- rel2.offset: -2 -2;
+ rel1.offset: 1 -2;
+ rel2.offset: 1 -2;
align: 0.0 1.0;
}
}
@@ -312,3 +313,64 @@ group { name: "elm/player/base/default";
}
}
+group { name: "elm/player/base/flush";
+ inherit: "elm/player/base/default";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ rel1.offset: 0 0;
+ rel2.offset: -1 -1;
+ }
+ }
+ part { name: "elm.swallow.content";
+ description { state: "default" 0.0;
+ rel1.offset: 0 0;
+ rel2.offset: -1 -1;
+ }
+ }
+ part { name: "bar";
+ description { state: "default" 0.0;
+ rel1.offset: 0 -1;
+ rel2.offset: -1 -1;
+ }
+ }
+ part { name: "barbevclip"; type: RECT;
+ description { state: "default" 0.0;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -1;
+ }
+ }
+ part { name: "barbev";
+ description { state: "default" 0.0;
+ rel1.offset: -1 0;
+ rel2.offset: 0 -1;
+ }
+ }
+ part { name: "elm.swallow.media_player.prev";
+ description { state: "default" 0.0;
+ rel1.offset: 0 7;
+ rel2.offset: 0 7;
+ }
+ description { state: "visible" 0.0;
+ rel1.offset: 0 -1;
+ rel2.offset: 0 -1;
+ }
+ }
+ part { name: "elm.swallow.media_player.slider";
+ description { state: "default" 0.0;
+ rel2.offset: -1 -1;
+ }
+ }
+
+ part { name: "shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "inset"; mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 0;
+ }
+ }
+ }
+}
--
------------------------------------------------------------------------------
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
