raster pushed a commit to branch master.
commit 71f7450d043019adb2cfeff46a56a3d3bb2a0fc7
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Jul 23 22:11:54 2013 +0900
match slider position swallow changes.
---
edje/edc/elm/player.edc | 6 +++---
edje/edc/elm/slider.edc | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/edje/edc/elm/player.edc b/edje/edc/elm/player.edc
index 6623298..9fa0b3c 100644
--- a/edje/edc/elm/player.edc
+++ b/edje/edc/elm/player.edc
@@ -56,7 +56,7 @@ group { name: "elm/player/base/default";
image.normal: "vgrad_med_lighter.png";
rel1.to_y: "elm.swallow.media_player.prev";
rel1.offset: 1 -1;
- rel2.to_y: "elm.swallow.media_player.slider";
+ rel2.to_y: "elm.swallow.media_player.position";
rel2.offset: -2 -1;
fill.smooth: 0;
TILED_HORIZ(120)
@@ -222,7 +222,7 @@ group { name: "elm/player/base/default";
rel2.offset: 0 -1;
}
}
- part { name: "elm.swallow.media_player.slider"; type: SWALLOW;
+ part { name: "elm.swallow.media_player.position"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 0 1;
@@ -356,7 +356,7 @@ group { name: "elm/player/base/flush";
rel2.offset: 0 -1;
}
}
- part { name: "elm.swallow.media_player.slider";
+ part { name: "elm.swallow.media_player.position";
description { state: "default" 0.0;
rel2.offset: -1 -1;
}
diff --git a/edje/edc/elm/slider.edc b/edje/edc/elm/slider.edc
index 72c5cfd..610c823 100644
--- a/edje/edc/elm/slider.edc
+++ b/edje/edc/elm/slider.edc
@@ -29,6 +29,8 @@ group { name: "elm/slider/hidden/limit";
group { name: "elm/slider/horizontal/default";
alias: "elm/slider/horizontal/disabled";
+ alias: "elm/slider/horizontal/media_player/position/default";
+ alias: "elm/slider/horizontal/media_player/position/flush";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
images.image: "slider_run_base_light_horiz.png" COMP;
@@ -610,6 +612,8 @@ group { name: "elm/slider/horizontal/default";
group { name: "elm/slider/horizontal/indicator/default";
alias: "elm/slider/horizontal/indicator/disabled";
alias: "elm/slider/horizontal/popup/default";
+ alias: "elm/slider/horizontal/indicator/media_player/position/default";
+ alias: "elm/slider/horizontal/indicator/media_player/position/flush";
images.image: "darken_rounded_square.png" COMP;
parts {
part { name: "base"; type: SPACER;
@@ -733,6 +737,8 @@ group { name: "elm/slider/horizontal/indicator/default";
group { name: "elm/slider/vertical/default";
alias: "elm/slider/vertical/disabled";
+ alias: "elm/slider/vertical/media_player/position/default";
+ alias: "elm/slider/vertical/media_player/position/flush";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;
images.image: "slider_run_base_light_vert.png" COMP;
@@ -1313,6 +1319,8 @@ group { name: "elm/slider/vertical/default";
group { name: "elm/slider/vertical/indicator/default";
alias: "elm/slider/vertical/indicator/disabled";
alias: "elm/slider/vertical/popup/default";
+ alias: "elm/slider/vertical/indicator/media_player/position/default";
+ alias: "elm/slider/vertical/indicator/media_player/position/flush";
images.image: "darken_rounded_square.png" COMP;
parts {
part { name: "base"; type: SPACER;
--
------------------------------------------------------------------------------
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
