From c1c101dfbee2989c8acd362d5149b1d52cd2c237 Mon Sep 17 00:00:00 2001 From: amitpatel Date: Thu, 30 Jul 2020 16:31:34 +0530 Subject: [PATCH] Speed popup layout changes Change-Id: I414aac684befdc56a5160091c7de9070c9ac38d7 Signed-off-by: amitpatel --- playview/res/edje/custom/pv-custom-button.edc | 143 +++++++++++++++++ .../button/T01-2_play_popup_icon_minus.png | Bin 1066 -> 385 bytes .../T01-2_play_popup_icon_minus_press.png | Bin 1116 -> 385 bytes .../button/T01-2_play_popup_icon_plus.png | Bin 1117 -> 394 bytes .../T01-2_play_popup_icon_plus_press.png | Bin 1201 -> 394 bytes playview/res/edje/images/button/x.png | Bin 0 -> 373 bytes playview/res/edje/pv-speed-popup.edc | 145 +++++++++++------- playview/src/feature/vp-play-speed.c | 80 +++------- playview/src/view/vp-play-normal-view.c | 13 +- vp-main/res/edje/custom/pv-custom-button.edc | 143 +++++++++++++++++ .../button/T01-2_play_popup_icon_minus.png | Bin 1066 -> 385 bytes .../T01-2_play_popup_icon_minus_press.png | Bin 1116 -> 385 bytes .../button/T01-2_play_popup_icon_plus.png | Bin 1117 -> 394 bytes .../T01-2_play_popup_icon_plus_press.png | Bin 1201 -> 394 bytes vp-main/res/edje/images/button/x.png | Bin 0 -> 373 bytes vp-main/res/edje/pv-speed-popup.edc | 145 +++++++++++------- 16 files changed, 496 insertions(+), 173 deletions(-) create mode 100755 playview/res/edje/images/button/x.png create mode 100755 vp-main/res/edje/images/button/x.png diff --git a/playview/res/edje/custom/pv-custom-button.edc b/playview/res/edje/custom/pv-custom-button.edc index 86f2427..8426bb6 100755 --- a/playview/res/edje/custom/pv-custom-button.edc +++ b/playview/res/edje/custom/pv-custom-button.edc @@ -4114,6 +4114,149 @@ group { } } +group { + name: "elm/button/base/play_speed_decr"; + images + { + image: "button/T01-2_play_popup_icon_minus.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + scale: 1; + mouse_events: 1; + description { + state: "default" 0.0; + min: 32 32; + max: 32 32; + align: 0.0 0.0; + fixed: 1 1; + } + } + part { + name: "icon"; + type: IMAGE; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + rel1 { + relative: 0.5 0.5; + to: "bg"; + } + rel2 { + relative: 0.5 0.5; + to: "bg"; + } + align: 0.5 0.5; + min: 11 18; + max: 11 18; + fixed: 1 1; + image { + normal: "button/T01-2_play_popup_icon_minus.png"; + } + } + } + } /*parts*/ + programs { + program { + name: "buttonclicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "buttontextclicked"; + signal: "mouse,clicked,1"; + source: "icon"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program{ + name: "touch_snd"; + source: "bg"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + program{ + name: "touch_snd1"; + source: "icon"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + } +} +group { + name: "elm/button/base/play_speed_incr"; + images + { + image: "button/T01-2_play_popup_icon_plus.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + scale: 1; + mouse_events: 1; + description { + state: "default" 0.0; + min: 32 32; + max: 32 32; + fixed: 1 1; + align: 0.0 0.0; + } + } + part { + name: "icon"; + type: IMAGE; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + to: "bg"; + } + rel2 { + relative: 1.0 1.0; + to: "bg"; + } + min: 11 18; + max: 11 18; + fixed: 1 1; + image { + normal: "button/T01-2_play_popup_icon_plus.png"; + } + } + } + } /*parts*/ + programs { + program { + name: "buttonclicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "buttontextclicked"; + signal: "mouse,clicked,1"; + source: "icon"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program{ + name: "touch_snd"; + source: "bg"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + program{ + name: "touch_snd1"; + source: "icon"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + } +} group { name: "elm/button/base/more_menu"; images diff --git a/playview/res/edje/images/button/T01-2_play_popup_icon_minus.png b/playview/res/edje/images/button/T01-2_play_popup_icon_minus.png index eb7f6c2411cd408899dab79c8b83faa964834842..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 GIT binary patch literal 385 zcmV-{0e=38P)4qGSd41+=8uh04Y!@C9hqSYskBCfZ^`t1-4F z(#i|?1X$y4p`}lN+>nL1V|JG{{KM^T?m73&oHHYAbBbOa)c_N`$wqvk+(M|L`h)S0 z)(}b##rzB4CE$n}L%+M6V3!WbS4oZLt&)}<{l|DlL7&nm>=oVJpmln&;jvCNQEA#)-DYZK!?uX0b=b8oS%iv;j14TinW zI;(|Z`Ey%v+C!$G+9$G_n-%7JK<^p&5375~US?f-#e{eBmM#WYa8E#5i0lJCgYbNH z4w+J#^b;ZnDBq0bG8>EKqmd9x4uyOh!6h~Wy^cqF4PhcT9q1&Z&HE594|27|K1>;F fd&kLb=y(4B0z7;a>O=tu00000NkvXXu0mjfhXHV%6t^f6RY?B;m@G3ORm8sYM{8R(C5~+xsR>aMsS#DBy7r~9Qu~a3C26NZ zCnO{`=1RbTkPs6KLkGH`4qe#c4?sdf3>^^RoF;*x>VPHt?mfTX`}n>0p46&$XL8qb z48zQnm#jKH7qj=$6#dS^(`9;GBX)~4aGUhp1TjS)Zy>fDx|^tuTz}`mC$zvYQ|+MH zBCX1@?%|MkGaJ4i#uUvk3yb~O^}2|#8)!3#4DS1fLyir6gIiH5pc0o*Cs^7|P-C~+ z^me@HDyauNOjvLUpBP_TOtCtew5}Y(K-WpFpt%C_pJ2+-b4TXp7 zN)Y+DmuBrbtJXqE@DTY5UOoBo<@s@!qM5Q?wceWRkN*I@%}<;F diff --git a/playview/res/edje/images/button/T01-2_play_popup_icon_minus_press.png b/playview/res/edje/images/button/T01-2_play_popup_icon_minus_press.png index 099735af8ed2dd9de483146b3d6a4e9b9a893c02..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 GIT binary patch literal 385 zcmV-{0e=38P)4qGSd41+=8uh04Y!@C9hqSYskBCfZ^`t1-4F z(#i|?1X$y4p`}lN+>nL1V|JG{{KM^T?m73&oHHYAbBbOa)c_N`$wqvk+(M|L`h)S0 z)(}b##rzB4CE$n}L%+M6V3!WbS4oZLt&)}<{l|DlL7&nm>=oVJpmln&;jvCNQEA#)-DYZK!?uX0b=b8oS%iv;j14TinW zI;(|Z`Ey%v+C!$G+9$G_n-%7JK<^p&5375~US?f-#e{eBmM#WYa8E#5i0lJCgYbNH z4w+J#^b;ZnDBq0bG8>EKqmd9x4uyOh!6h~Wy^cqF4PhcT9q1&Z&HE594|27|K1>;F fd&kLb=y(4B0z7;a>O=tu00000NkvXXu0mjfhXlTu)b{>-1RQ*dBz;6}UC0CMz{|49AF7c#w5L z4zf9!hcZxQ^%yGx2m~k!;CL1SO*yUs$o2-;sD6 zPYY00RRM^CC}t@ln=FRJ>1M;^&_KaJi5vS7@o~teip~^XAO((ky7q)1s#Mm6!=xW5 z8Zx2lL;~c25CrMFdgz4I(O)+t5hEQ2Fjf$4I+^yy~3c~D3@CZ?@%{^sv5w5^6~<)+zgx6fYqHJ4oV zF8^L$UY@?XiZTAWvU=vyDjl=+v%?gbA@yn_-S-Cb?8C87^t5an#b)W9d-ux0a% zc+_fc`M9TiedRUt_;x9CxYOElr<7^88lUa)9lM_%xnb0Sy|wZ3^ltmjt?fH^z5b@& f8@BddJG$>}hME0&zwz)MdQNp2+pHQ-^wz~cXV_?o diff --git a/playview/res/edje/images/button/T01-2_play_popup_icon_plus.png b/playview/res/edje/images/button/T01-2_play_popup_icon_plus.png index 342d9eb2da13be84535b3a4f1e79f33607168f98..d0c3fd4fde8753f8c7f767303eae2a6aecd644b1 100755 GIT binary patch literal 394 zcmV;50d@X~P)J9z5VTP75SRO&cfv@xP$SOjHB3hZm_H~gb9Ia z;txh?jDkvug55>oATlMe>S>T#zGk2{3fEj0s>N*3+g2$C;!xqRvxbmcKE1oY&~G4$ z?$um!(lLp`3wn6<6Z#KC(SmaVs)JGoi1g8ZbEV*RAc7*fcf)4`fyZKg&TKqM2F&*= zWi0z)t)TXg(}5L~vtO6$Nj^qpTjfC{;oj5zd>*Jw(!4VSAY@Z)m@f ztWvRh3F;!ALk~S{CCtIt;~K?jnmsmND%wx$=0Y0Gy#97CnE^?pbs3R&0;`ek*3CYQ o(DQoM62<$FchTNs*0x3QZ}8%K;)n$T2><{907*qoM6N<$g4VIHLI3~& literal 1117 zcmbVLO>5LZ7!LjLqqJCxMO_r8>8a99GD)`Ggs$yolXMrmwd^i*1;J*M**3Jvq{-CX z_Efxx7wN&9^rXEgSbFlH;6X$@wL%Z#KM(}Z1))ybZuL++IFQWO^SsYH@5ker>B*k1 zL>I#_J%zkpqVstCb+ps})^g7eI$a}1m6UOvG^`LYSqIk;D0tR9Dj~~RUH**57^c1M zR;r|0oKkJ)cB)#O0XZBZkm7`- zEsQ`gB6Cm{6j>Ptq5uURio7tIgo2tHRRsu6220gKr>>TC^F)j8GVB5&fy(oZMuTfe z91iDss3;0Ah`cB!DIyuI`owA`{b;adK}V4tx&d*q4`Pc}4X=<4OFcb)f)^Bvr-uFL zBv3SDeA5be$O*jX#qT;oN2G-QxN#;rs;mZxFQEvpgf`7beXvEQvHQ1B45Z$ucS4sY z#ahy_z2YIC6!Z*BZ#c(wRKYaUnrT2;lte>>P*a3-*3eU_lq71JX|`;f$sLuTVx}m0 zM1#n`z0^Tik*l5zDtxOV^EckGc9kxoR#%7QtZ!{^l%~scO9zv<-EPvOy9GU4$$zr*A1?J>HTyTVCI;lE z7q{EK?Cnjw>$;cA<;?!>MrVQLdgl^}L^o1j4h-cld~Ex=ars59+-u(N?6^_bd-nXh l<=h0-?!MvtJ9z5VTP75SRO&cfv@xP$SOjHB3hZm_H~gb9Ia z;txh?jDkvug55>oATlMe>S>T#zGk2{3fEj0s>N*3+g2$C;!xqRvxbmcKE1oY&~G4$ z?$um!(lLp`3wn6<6Z#KC(SmaVs)JGoi1g8ZbEV*RAc7*fcf)4`fyZKg&TKqM2F&*= zWi0z)t)TXg(}5L~vtO6$Nj^qpTjfC{;oj5zd>*Jw(!4VSAY@Z)m@f ztWvRh3F;!ALk~S{CCtIt;~K?jnmsmND%wx$=0Y0Gy#97CnE^?pbs3R&0;`ek*3CYQ o(DQoM62<$FchTNs*0x3QZ}8%K;)n$T2><{907*qoM6N<$g4VIHLI3~& literal 1201 zcmbVLTWAzl7#?a15)e@=rGhYwwoucZIcH|}GQ+MRyEAJR+%(-?Fg}<%nK_#b$;=sN zPP&uWmPQ}6Pzt3OdlL(NYAGqCk5+=hsx5&O5sfe2(T7HZt)ggjJ(Fb97J?5wFmrDI z_x<1bFQ0UEZeP=~v4vrnHH8kXMCZ2XTfK_@_l#b>L#Nk?-c8E5N@|9Wn05>IBDUZd zeW-*CYk2Q(D9tdds&=KDbQgE1CU$ruvf)F=qiBXnw}qZz4j{tzqCVTraC65eIo7r^ z+|GCr6ulhkw>w6BR37Q9m?HzGVsUNT*mS5;0tXR;4V^(ZP{Rzjz^l@AbS!Y}f(aSO zaEqe4i(PCE`-qM6AZCIDWD_zEWuVB)+pGv65TGc4WDEi|o>T#3mj*|@`BqgeY565z zbeG}!3Gq}xsMTtGP2#cNCqP9}1Rx5c7^4=kVAv%_7;}ToO$H4Grf+-1#x5H%8ohXk zWH_pH@d=JsEG`qf!BU`T$b``F1jqxyaiVuESO=tp{*kewbx;}hkWfMa9`a3^kLu+~N($tagdCTWS`OqSxrr^f0Wn+?HT~Mu?-DloLadte zkwLIu!FaG)0bTu=;GiFSY_1&VA-mIdEnEwt^enzsL%#h!vhqH5*oFA2_6q)i21Qu{ zSy_UzEGK1#nL>Y6&Nj-OP_9*n+LhHV|>~g zCraEd+E$6K9Tol1HsK?+l<-mV=xEQAv9D+Fn^X)_&^xv9?4JG40hcGPeEKP)1wkb|aWm>PZyrp;3@16e^KWDhRELUqFFBK&K=W zIwYc@(78f`U5!L5(e9k&a(5#;cXnsF=K7m%X5M$c?|a^i(7}=pv~FUHV%as3^!Oo3E zstd&LU(SH7@(w0cFptO`hEsI7k%`-2YVuFpT0=+Y!k?7#aXSOo>cici;?ns6rLt|L Taq<#k00000NkvXXu0mjfC1auh literal 0 HcmV?d00001 diff --git a/playview/res/edje/pv-speed-popup.edc b/playview/res/edje/pv-speed-popup.edc index ebce651..8a901ce 100755 --- a/playview/res/edje/pv-speed-popup.edc +++ b/playview/res/edje/pv-speed-popup.edc @@ -15,17 +15,22 @@ */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" +#define SPEED_POPUP_WIDTH_HEIGHT_MIN 0 105 +#define SPEED_POPUP_CONTENT_MIN 0 73 +#define SPEED_POPUP_BUTTON_MIN 32 32 + + +#define PLAY_SPEED_X "button/x.png" -#define SPEED_POPUP_WIDTH_HEIGHT_MIN 0 100 -#define SPEED_POPUP_CONTENT_MIN 0 50 -#define SPEED_POPUP_BUTTON_MIN 40 40 externals { external: "elm"; external: "feedback"; } collections { + base_scale : CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; @@ -35,6 +40,9 @@ collections { } group { name: "pv.play.speed.popup"; + images { + image: PLAY_SPEED_X COMP; + } parts { part { name:"bg"; @@ -43,51 +51,56 @@ collections { description { state: "default" 0.0; min: SPEED_POPUP_WIDTH_HEIGHT_MIN; - color: 0 0 0 0; + color: 255 0 0 50; + visible:0; } } part { name: "pad_l"; - type: SPACER; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 10 0; - max: 10 0; - fixed: 1 0; + min: 144 32; + max: 144 32; + fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "bg";} - rel2 { relative: 0.0 1.0; to: "bg";} + rel2 { relative: 0.0 0.0; to: "bg";} + } } part { name: "pad_r"; - type: SPACER; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 10 0; - max: 10 0; - fixed: 1 0; - align: 1.0 1.0; + min: 144 32; + max: 144 32; + fixed: 1 1; + align: 1.0 0.0; rel1 { relative: 1.0 0.0; to: "bg";} - rel2 { relative: 1.0 1.0; to: "bg";} + rel2 { relative: 1.0 0.0; to: "bg";} + } } part { - name: "pad_t"; - type: SPACER; + name: "pad_text_l"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 0 10; - fixed: 0 1; + min: 176 32; + max: 176 32; + fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "bg";} - rel2 { relative: 0.0 0.0; to: "bg";} + rel1 { relative: 1.0 0.0; to: "pad_l";} + rel2 { relative: 1.0 0.0; to: "pad_l";} + } } @@ -99,20 +112,38 @@ collections { description { state: "default" 0.0; visible: 1; - min: 0 54; + min: 37 26; + max: 37 26; fixed: 0 1; - align: 0.5 0.0; - rel1 { relative: 0.0 1.0; to_y: "pad_t";} - rel2 { relative: 1.0 1.0; to_y: "pad_t";} + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";} + rel2 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";} color: 0 0 0 255; text { - font: "Tizen:style=Bold"; - size: 25; - align: 0.5 0.5; + font: "Tizen:style=Regular"; + size: 22; + align: 1.0 0.5; } } } + part { + name: "playspeed_x_image"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + min: 11 26; + max: 11 26; + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;} + rel2 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;} + image{ normal: PLAY_SPEED_X; } + } + } + part { name: "elm.swallow.icon.1"; type: SWALLOW; @@ -120,55 +151,59 @@ collections { description { state: "default" 0.0; min: SPEED_POPUP_BUTTON_MIN; + max: SPEED_POPUP_BUTTON_MIN; fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; } - rel2 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; } + rel1 { relative: 1.0 0.0; to : "pad_l"; } + rel2 { relative: 1.0 1.0; to : "pad_l"; } } } part { - name: "elm.swallow.icon.left"; - type: RECT; + name: "elm.swallow.icon.2"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - visible: 0; - min: 6 0; - max: 6 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; } - rel2 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; } + min: SPEED_POPUP_BUTTON_MIN; + max: SPEED_POPUP_BUTTON_MIN; + fixed: 1 1; + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to: "pad_r"; } + rel2 { relative: 0.0 1.0; to: "pad_r"; } } } + part { - name: "elm.swallow.icon.right"; - type: RECT; + name: "slider.pad.l"; + type: RECT; scale: 1; description { state: "default" 0.0; - visible: 0; - min: 6 0; - max: 6 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; } - rel2 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; } + min: 40 40; + max: 40 40; + fixed: 1 1; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to : "bg"; } + rel2 { relative: 0.0 1.0; to : "bg"; } + } } part { - name: "elm.swallow.icon.2"; - type: SWALLOW; + name: "slider.pad.r"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: SPEED_POPUP_BUTTON_MIN; + min: 40 40; + max: 40 40; fixed: 1 1; align: 1.0 0.0; - rel1 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; } - rel2 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; } + rel1 { relative: 1.0 0.0; to : "bg"; } + rel2 { relative: 1.0 1.0; to : "bg"; } + visible: 0; + color: 0 255 0 200; } } @@ -181,8 +216,8 @@ collections { min: SPEED_POPUP_CONTENT_MIN; fixed: 0 1; align: 0.5 0.0; - rel1 { relative: 1.0 1.0; to_x: "pad_l"; to_y: "elm.swallow.icon.1"; } - rel2 { relative: 0.0 1.0; to_x: "pad_r"; to_y: "elm.swallow.icon.1"; } + rel1 { relative: 1.0 1.0; to_x: "slider.pad.l"; to_y: "pad_l"; } + rel2 { relative: 0.0 1.0; to_x: "slider.pad.r"; to_y: "pad_l"; } } } } /* parts */ diff --git a/playview/src/feature/vp-play-speed.c b/playview/src/feature/vp-play-speed.c index cf6c87e..6022f7f 100755 --- a/playview/src/feature/vp-play-speed.c +++ b/playview/src/feature/vp-play-speed.c @@ -293,9 +293,9 @@ static void _vp_play_speed_update_text(PlaySpeedPopup * pPlaySpeedPopup) return; } - char szValue[6] = { 0, }; + char szValue[4] = { 0, }; - snprintf(szValue, 6, "%0.1f X", (double) pPlaySpeedPopup->fSpeedVal); + snprintf(szValue, 4, "%0.1f", (double) pPlaySpeedPopup->fSpeedVal); elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title", szValue); @@ -411,64 +411,24 @@ static bool _vp_play_speed_popup_create_button(Evas_Object * pParent, free(path); PlaySpeedPopup *pPlaySpeedPopup = (PlaySpeedPopup *) pUserData; - pPlaySpeedPopup->pDelButton = - vp_button_create(pParent, "custom/flat_63_78/default", - NULL, - (Evas_Smart_Cb) __vp_play_speed_btn_clicked_cb, - (Evas_Smart_Cb) NULL, (Evas_Smart_Cb) NULL, - (void *) pPlaySpeedPopup); - - - - pPlaySpeedPopup->pAddButton = - vp_button_create(pParent, "custom/flat_63_78/default", - NULL, - (Evas_Smart_Cb) __vp_play_speed_btn_clicked_cb, - (Evas_Smart_Cb) NULL, (Evas_Smart_Cb) NULL, - (void *) pPlaySpeedPopup); - - Evas_Object *pIcon = NULL; - - pIcon = - vp_button_create_icon(pPlaySpeedPopup->pDelButton, - edj_path, VP_PLAY_RES_BUTTON_DEL); - elm_object_part_content_set(pPlaySpeedPopup->pDelButton, - VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); - - pIcon = - vp_button_create_icon(pPlaySpeedPopup->pDelButton, - edj_path, VP_PLAY_RES_BUTTON_DEL_PRESS); - elm_object_part_content_set(pPlaySpeedPopup->pDelButton, - VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon); - - pIcon = - vp_button_create_icon(pPlaySpeedPopup->pDelButton, - edj_path, VP_PLAY_RES_BUTTON_DEL); - elm_object_part_content_set(pPlaySpeedPopup->pDelButton, - VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon); - - pIcon = - vp_button_create_icon(pPlaySpeedPopup->pAddButton, - edj_path, VP_PLAY_RES_BUTTON_ADD); - elm_object_part_content_set(pPlaySpeedPopup->pAddButton, - VP_PLAY_SWALLOW_BUTTON_ICON, pIcon); - - pIcon = - vp_button_create_icon(pPlaySpeedPopup->pAddButton, - edj_path, VP_PLAY_RES_BUTTON_ADD_PRESS); - elm_object_part_content_set(pPlaySpeedPopup->pAddButton, - VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon); - - pIcon = - vp_button_create_icon(pPlaySpeedPopup->pAddButton, - edj_path, VP_PLAY_RES_BUTTON_ADD); - elm_object_part_content_set(pPlaySpeedPopup->pAddButton, - VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon); - - elm_object_part_content_set(pParent, "elm.swallow.icon.1", - pPlaySpeedPopup->pDelButton); - elm_object_part_content_set(pParent, "elm.swallow.icon.2", - pPlaySpeedPopup->pAddButton); + + pPlaySpeedPopup->pDelButton = elm_button_add(pParent); + elm_object_style_set(pPlaySpeedPopup->pDelButton, "play_speed_decr"); + evas_object_smart_callback_add(pPlaySpeedPopup->pDelButton, "clicked", + __vp_play_speed_btn_clicked_cb, + (void *) pPlaySpeedPopup); + elm_object_part_content_set(pParent, "elm.swallow.icon.1", + pPlaySpeedPopup->pDelButton); + + pPlaySpeedPopup->pAddButton = elm_button_add(pParent); + elm_object_style_set(pPlaySpeedPopup->pAddButton, "play_speed_incr"); + evas_object_smart_callback_add(pPlaySpeedPopup->pAddButton, "clicked", + __vp_play_speed_btn_clicked_cb, + (void *) pPlaySpeedPopup); + elm_object_part_content_set(pParent, "elm.swallow.icon.2", + pPlaySpeedPopup->pAddButton); + + return TRUE; } diff --git a/playview/src/view/vp-play-normal-view.c b/playview/src/view/vp-play-normal-view.c index f09f185..e46cf12 100755 --- a/playview/src/view/vp-play-normal-view.c +++ b/playview/src/view/vp-play-normal-view.c @@ -5867,7 +5867,8 @@ static void __vp_normal_more_btn_clicked_cb(void *pUserData, nH = rect.w; } */ - evas_object_resize(pNormalView->pCtxPopup, 320, 300); + + evas_object_size_hint_max_set(pNormalView->pCtxPopup, 320, 350); evas_object_move(pNormalView->pCtxPopup, 1280, 64); evas_object_show(pNormalView->pCtxPopup); @@ -7719,8 +7720,14 @@ static void _vp_play_normal_view_show_audio_only_popup(NormalView * VideoLogInfo ("Show toast popup: Only audio data supported by this file. Now playing video."); _vp_normal_set_audio_only_image(pNormalView, TRUE); - vp_play_util_status_noti_show - (VP_PLAY_STRING_ERROR_ONLY_AUDIO_DATA_SUPPORTED); + + PlayView * pPlayView = pNormalView->pPlayView; + if (!pPlayView) { + VideoLogError("pPlayView is NULL"); + return; + } + vp_play_util_popup_toast_show(pPlayView->pWin, VP_PLAY_STRING_ERROR_ONLY_AUDIO_DATA_SUPPORTED); + } /** diff --git a/vp-main/res/edje/custom/pv-custom-button.edc b/vp-main/res/edje/custom/pv-custom-button.edc index fde2d13..4581ceb 100755 --- a/vp-main/res/edje/custom/pv-custom-button.edc +++ b/vp-main/res/edje/custom/pv-custom-button.edc @@ -4115,6 +4115,149 @@ group { } } +group { + name: "elm/button/base/play_speed_decr"; + images + { + image: "button/T01-2_play_popup_icon_minus.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + scale: 1; + mouse_events: 1; + description { + state: "default" 0.0; + min: 32 32; + max: 32 32; + align: 0.0 0.0; + fixed: 1 1; + } + } + part { + name: "icon"; + type: IMAGE; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + rel1 { + relative: 0.5 0.5; + to: "bg"; + } + rel2 { + relative: 0.5 0.5; + to: "bg"; + } + align: 0.5 0.5; + min: 11 18; + max: 11 18; + fixed: 1 1; + image { + normal: "button/T01-2_play_popup_icon_minus.png"; + } + } + } + } /*parts*/ + programs { + program { + name: "buttonclicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "buttontextclicked"; + signal: "mouse,clicked,1"; + source: "icon"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program{ + name: "touch_snd"; + source: "bg"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + program{ + name: "touch_snd1"; + source: "icon"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + } +} +group { + name: "elm/button/base/play_speed_incr"; + images + { + image: "button/T01-2_play_popup_icon_plus.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + scale: 1; + mouse_events: 1; + description { + state: "default" 0.0; + min: 32 32; + max: 32 32; + fixed: 1 1; + align: 0.0 0.0; + } + } + part { + name: "icon"; + type: IMAGE; + mouse_events: 1; + scale: 1; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + to: "bg"; + } + rel2 { + relative: 1.0 1.0; + to: "bg"; + } + min: 11 18; + max: 11 18; + fixed: 1 1; + image { + normal: "button/T01-2_play_popup_icon_plus.png"; + } + } + } + } /*parts*/ + programs { + program { + name: "buttonclicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { + name: "buttontextclicked"; + signal: "mouse,clicked,1"; + source: "icon"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program{ + name: "touch_snd"; + source: "bg"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + program{ + name: "touch_snd1"; + source: "icon"; + signal: "mouse,clicked,1"; + action: RUN_PLUGIN "touch_sound_plugin"; + } + } +} group { name: "elm/button/base/more_menu"; images diff --git a/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus.png b/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus.png index eb7f6c2411cd408899dab79c8b83faa964834842..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 GIT binary patch literal 385 zcmV-{0e=38P)4qGSd41+=8uh04Y!@C9hqSYskBCfZ^`t1-4F z(#i|?1X$y4p`}lN+>nL1V|JG{{KM^T?m73&oHHYAbBbOa)c_N`$wqvk+(M|L`h)S0 z)(}b##rzB4CE$n}L%+M6V3!WbS4oZLt&)}<{l|DlL7&nm>=oVJpmln&;jvCNQEA#)-DYZK!?uX0b=b8oS%iv;j14TinW zI;(|Z`Ey%v+C!$G+9$G_n-%7JK<^p&5375~US?f-#e{eBmM#WYa8E#5i0lJCgYbNH z4w+J#^b;ZnDBq0bG8>EKqmd9x4uyOh!6h~Wy^cqF4PhcT9q1&Z&HE594|27|K1>;F fd&kLb=y(4B0z7;a>O=tu00000NkvXXu0mjfhXHV%6t^f6RY?B;m@G3ORm8sYM{8R(C5~+xsR>aMsS#DBy7r~9Qu~a3C26NZ zCnO{`=1RbTkPs6KLkGH`4qe#c4?sdf3>^^RoF;*x>VPHt?mfTX`}n>0p46&$XL8qb z48zQnm#jKH7qj=$6#dS^(`9;GBX)~4aGUhp1TjS)Zy>fDx|^tuTz}`mC$zvYQ|+MH zBCX1@?%|MkGaJ4i#uUvk3yb~O^}2|#8)!3#4DS1fLyir6gIiH5pc0o*Cs^7|P-C~+ z^me@HDyauNOjvLUpBP_TOtCtew5}Y(K-WpFpt%C_pJ2+-b4TXp7 zN)Y+DmuBrbtJXqE@DTY5UOoBo<@s@!qM5Q?wceWRkN*I@%}<;F diff --git a/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus_press.png b/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus_press.png index 099735af8ed2dd9de483146b3d6a4e9b9a893c02..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 GIT binary patch literal 385 zcmV-{0e=38P)4qGSd41+=8uh04Y!@C9hqSYskBCfZ^`t1-4F z(#i|?1X$y4p`}lN+>nL1V|JG{{KM^T?m73&oHHYAbBbOa)c_N`$wqvk+(M|L`h)S0 z)(}b##rzB4CE$n}L%+M6V3!WbS4oZLt&)}<{l|DlL7&nm>=oVJpmln&;jvCNQEA#)-DYZK!?uX0b=b8oS%iv;j14TinW zI;(|Z`Ey%v+C!$G+9$G_n-%7JK<^p&5375~US?f-#e{eBmM#WYa8E#5i0lJCgYbNH z4w+J#^b;ZnDBq0bG8>EKqmd9x4uyOh!6h~Wy^cqF4PhcT9q1&Z&HE594|27|K1>;F fd&kLb=y(4B0z7;a>O=tu00000NkvXXu0mjfhXlTu)b{>-1RQ*dBz;6}UC0CMz{|49AF7c#w5L z4zf9!hcZxQ^%yGx2m~k!;CL1SO*yUs$o2-;sD6 zPYY00RRM^CC}t@ln=FRJ>1M;^&_KaJi5vS7@o~teip~^XAO((ky7q)1s#Mm6!=xW5 z8Zx2lL;~c25CrMFdgz4I(O)+t5hEQ2Fjf$4I+^yy~3c~D3@CZ?@%{^sv5w5^6~<)+zgx6fYqHJ4oV zF8^L$UY@?XiZTAWvU=vyDjl=+v%?gbA@yn_-S-Cb?8C87^t5an#b)W9d-ux0a% zc+_fc`M9TiedRUt_;x9CxYOElr<7^88lUa)9lM_%xnb0Sy|wZ3^ltmjt?fH^z5b@& f8@BddJG$>}hME0&zwz)MdQNp2+pHQ-^wz~cXV_?o diff --git a/vp-main/res/edje/images/button/T01-2_play_popup_icon_plus.png b/vp-main/res/edje/images/button/T01-2_play_popup_icon_plus.png index 342d9eb2da13be84535b3a4f1e79f33607168f98..d0c3fd4fde8753f8c7f767303eae2a6aecd644b1 100755 GIT binary patch literal 394 zcmV;50d@X~P)J9z5VTP75SRO&cfv@xP$SOjHB3hZm_H~gb9Ia z;txh?jDkvug55>oATlMe>S>T#zGk2{3fEj0s>N*3+g2$C;!xqRvxbmcKE1oY&~G4$ z?$um!(lLp`3wn6<6Z#KC(SmaVs)JGoi1g8ZbEV*RAc7*fcf)4`fyZKg&TKqM2F&*= zWi0z)t)TXg(}5L~vtO6$Nj^qpTjfC{;oj5zd>*Jw(!4VSAY@Z)m@f ztWvRh3F;!ALk~S{CCtIt;~K?jnmsmND%wx$=0Y0Gy#97CnE^?pbs3R&0;`ek*3CYQ o(DQoM62<$FchTNs*0x3QZ}8%K;)n$T2><{907*qoM6N<$g4VIHLI3~& literal 1117 zcmbVLO>5LZ7!LjLqqJCxMO_r8>8a99GD)`Ggs$yolXMrmwd^i*1;J*M**3Jvq{-CX z_Efxx7wN&9^rXEgSbFlH;6X$@wL%Z#KM(}Z1))ybZuL++IFQWO^SsYH@5ker>B*k1 zL>I#_J%zkpqVstCb+ps})^g7eI$a}1m6UOvG^`LYSqIk;D0tR9Dj~~RUH**57^c1M zR;r|0oKkJ)cB)#O0XZBZkm7`- zEsQ`gB6Cm{6j>Ptq5uURio7tIgo2tHRRsu6220gKr>>TC^F)j8GVB5&fy(oZMuTfe z91iDss3;0Ah`cB!DIyuI`owA`{b;adK}V4tx&d*q4`Pc}4X=<4OFcb)f)^Bvr-uFL zBv3SDeA5be$O*jX#qT;oN2G-QxN#;rs;mZxFQEvpgf`7beXvEQvHQ1B45Z$ucS4sY z#ahy_z2YIC6!Z*BZ#c(wRKYaUnrT2;lte>>P*a3-*3eU_lq71JX|`;f$sLuTVx}m0 zM1#n`z0^Tik*l5zDtxOV^EckGc9kxoR#%7QtZ!{^l%~scO9zv<-EPvOy9GU4$$zr*A1?J>HTyTVCI;lE z7q{EK?Cnjw>$;cA<;?!>MrVQLdgl^}L^o1j4h-cld~Ex=ars59+-u(N?6^_bd-nXh l<=h0-?!MvtJ9z5VTP75SRO&cfv@xP$SOjHB3hZm_H~gb9Ia z;txh?jDkvug55>oATlMe>S>T#zGk2{3fEj0s>N*3+g2$C;!xqRvxbmcKE1oY&~G4$ z?$um!(lLp`3wn6<6Z#KC(SmaVs)JGoi1g8ZbEV*RAc7*fcf)4`fyZKg&TKqM2F&*= zWi0z)t)TXg(}5L~vtO6$Nj^qpTjfC{;oj5zd>*Jw(!4VSAY@Z)m@f ztWvRh3F;!ALk~S{CCtIt;~K?jnmsmND%wx$=0Y0Gy#97CnE^?pbs3R&0;`ek*3CYQ o(DQoM62<$FchTNs*0x3QZ}8%K;)n$T2><{907*qoM6N<$g4VIHLI3~& literal 1201 zcmbVLTWAzl7#?a15)e@=rGhYwwoucZIcH|}GQ+MRyEAJR+%(-?Fg}<%nK_#b$;=sN zPP&uWmPQ}6Pzt3OdlL(NYAGqCk5+=hsx5&O5sfe2(T7HZt)ggjJ(Fb97J?5wFmrDI z_x<1bFQ0UEZeP=~v4vrnHH8kXMCZ2XTfK_@_l#b>L#Nk?-c8E5N@|9Wn05>IBDUZd zeW-*CYk2Q(D9tdds&=KDbQgE1CU$ruvf)F=qiBXnw}qZz4j{tzqCVTraC65eIo7r^ z+|GCr6ulhkw>w6BR37Q9m?HzGVsUNT*mS5;0tXR;4V^(ZP{Rzjz^l@AbS!Y}f(aSO zaEqe4i(PCE`-qM6AZCIDWD_zEWuVB)+pGv65TGc4WDEi|o>T#3mj*|@`BqgeY565z zbeG}!3Gq}xsMTtGP2#cNCqP9}1Rx5c7^4=kVAv%_7;}ToO$H4Grf+-1#x5H%8ohXk zWH_pH@d=JsEG`qf!BU`T$b``F1jqxyaiVuESO=tp{*kewbx;}hkWfMa9`a3^kLu+~N($tagdCTWS`OqSxrr^f0Wn+?HT~Mu?-DloLadte zkwLIu!FaG)0bTu=;GiFSY_1&VA-mIdEnEwt^enzsL%#h!vhqH5*oFA2_6q)i21Qu{ zSy_UzEGK1#nL>Y6&Nj-OP_9*n+LhHV|>~g zCraEd+E$6K9Tol1HsK?+l<-mV=xEQAv9D+Fn^X)_&^xv9?4JG40hcGPeEKP)1wkb|aWm>PZyrp;3@16e^KWDhRELUqFFBK&K=W zIwYc@(78f`U5!L5(e9k&a(5#;cXnsF=K7m%X5M$c?|a^i(7}=pv~FUHV%as3^!Oo3E zstd&LU(SH7@(w0cFptO`hEsI7k%`-2YVuFpT0=+Y!k?7#aXSOo>cici;?ns6rLt|L Taq<#k00000NkvXXu0mjfC1auh literal 0 HcmV?d00001 diff --git a/vp-main/res/edje/pv-speed-popup.edc b/vp-main/res/edje/pv-speed-popup.edc index ebce651..8a901ce 100755 --- a/vp-main/res/edje/pv-speed-popup.edc +++ b/vp-main/res/edje/pv-speed-popup.edc @@ -15,17 +15,22 @@ */ #include "pv-image.edc" +#include "custom/pv-custom-define.edc" +#define SPEED_POPUP_WIDTH_HEIGHT_MIN 0 105 +#define SPEED_POPUP_CONTENT_MIN 0 73 +#define SPEED_POPUP_BUTTON_MIN 32 32 + + +#define PLAY_SPEED_X "button/x.png" -#define SPEED_POPUP_WIDTH_HEIGHT_MIN 0 100 -#define SPEED_POPUP_CONTENT_MIN 0 50 -#define SPEED_POPUP_BUTTON_MIN 40 40 externals { external: "elm"; external: "feedback"; } collections { + base_scale : CURRENT_BASE_SCALE; plugins { plugin { name: "touch_sound_plugin"; @@ -35,6 +40,9 @@ collections { } group { name: "pv.play.speed.popup"; + images { + image: PLAY_SPEED_X COMP; + } parts { part { name:"bg"; @@ -43,51 +51,56 @@ collections { description { state: "default" 0.0; min: SPEED_POPUP_WIDTH_HEIGHT_MIN; - color: 0 0 0 0; + color: 255 0 0 50; + visible:0; } } part { name: "pad_l"; - type: SPACER; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 10 0; - max: 10 0; - fixed: 1 0; + min: 144 32; + max: 144 32; + fixed: 1 1; align: 0.0 0.0; rel1 { relative: 0.0 0.0; to: "bg";} - rel2 { relative: 0.0 1.0; to: "bg";} + rel2 { relative: 0.0 0.0; to: "bg";} + } } part { name: "pad_r"; - type: SPACER; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 10 0; - max: 10 0; - fixed: 1 0; - align: 1.0 1.0; + min: 144 32; + max: 144 32; + fixed: 1 1; + align: 1.0 0.0; rel1 { relative: 1.0 0.0; to: "bg";} - rel2 { relative: 1.0 1.0; to: "bg";} + rel2 { relative: 1.0 0.0; to: "bg";} + } } part { - name: "pad_t"; - type: SPACER; + name: "pad_text_l"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: 0 10; - fixed: 0 1; + min: 176 32; + max: 176 32; + fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 0.0 0.0; to: "bg";} - rel2 { relative: 0.0 0.0; to: "bg";} + rel1 { relative: 1.0 0.0; to: "pad_l";} + rel2 { relative: 1.0 0.0; to: "pad_l";} + } } @@ -99,20 +112,38 @@ collections { description { state: "default" 0.0; visible: 1; - min: 0 54; + min: 37 26; + max: 37 26; fixed: 0 1; - align: 0.5 0.0; - rel1 { relative: 0.0 1.0; to_y: "pad_t";} - rel2 { relative: 1.0 1.0; to_y: "pad_t";} + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";} + rel2 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";} color: 0 0 0 255; text { - font: "Tizen:style=Bold"; - size: 25; - align: 0.5 0.5; + font: "Tizen:style=Regular"; + size: 22; + align: 1.0 0.5; } } } + part { + name: "playspeed_x_image"; + type: IMAGE; + scale: 1; + description { + state: "default" 0.0; + visible: 1; + fixed: 1 1; + min: 11 26; + max: 11 26; + align: 0.0 0.0; + rel1 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;} + rel2 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;} + image{ normal: PLAY_SPEED_X; } + } + } + part { name: "elm.swallow.icon.1"; type: SWALLOW; @@ -120,55 +151,59 @@ collections { description { state: "default" 0.0; min: SPEED_POPUP_BUTTON_MIN; + max: SPEED_POPUP_BUTTON_MIN; fixed: 1 1; align: 0.0 0.0; - rel1 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; } - rel2 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; } + rel1 { relative: 1.0 0.0; to : "pad_l"; } + rel2 { relative: 1.0 1.0; to : "pad_l"; } } } part { - name: "elm.swallow.icon.left"; - type: RECT; + name: "elm.swallow.icon.2"; + type: SWALLOW; scale: 1; description { state: "default" 0.0; - visible: 0; - min: 6 0; - max: 6 0; - fixed: 1 0; - align: 0.0 0.5; - rel1 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; } - rel2 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; } + min: SPEED_POPUP_BUTTON_MIN; + max: SPEED_POPUP_BUTTON_MIN; + fixed: 1 1; + align: 1.0 0.0; + rel1 { relative: 0.0 0.0; to: "pad_r"; } + rel2 { relative: 0.0 1.0; to: "pad_r"; } } } + part { - name: "elm.swallow.icon.right"; - type: RECT; + name: "slider.pad.l"; + type: RECT; scale: 1; description { state: "default" 0.0; - visible: 0; - min: 6 0; - max: 6 0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; } - rel2 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; } + min: 40 40; + max: 40 40; + fixed: 1 1; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to : "bg"; } + rel2 { relative: 0.0 1.0; to : "bg"; } + } } part { - name: "elm.swallow.icon.2"; - type: SWALLOW; + name: "slider.pad.r"; + type: RECT; scale: 1; description { state: "default" 0.0; - min: SPEED_POPUP_BUTTON_MIN; + min: 40 40; + max: 40 40; fixed: 1 1; align: 1.0 0.0; - rel1 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; } - rel2 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; } + rel1 { relative: 1.0 0.0; to : "bg"; } + rel2 { relative: 1.0 1.0; to : "bg"; } + visible: 0; + color: 0 255 0 200; } } @@ -181,8 +216,8 @@ collections { min: SPEED_POPUP_CONTENT_MIN; fixed: 0 1; align: 0.5 0.0; - rel1 { relative: 1.0 1.0; to_x: "pad_l"; to_y: "elm.swallow.icon.1"; } - rel2 { relative: 0.0 1.0; to_x: "pad_r"; to_y: "elm.swallow.icon.1"; } + rel1 { relative: 1.0 1.0; to_x: "slider.pad.l"; to_y: "pad_l"; } + rel2 { relative: 0.0 1.0; to_x: "slider.pad.r"; to_y: "pad_l"; } } } } /* parts */ -- 2.34.1