projects / profile / mobile / apps / native / video-player.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70ee688)
[UX IMPL]Button text added and GUI changes 31/89431/1 submit/tizen_mobile/20160927.154822 submit/tizen_mobile/20160928.134326 submit/tizen_mobile/20160929.163748 submit/tizen_mobile/20160930.120631
authorAlka Sethi <alka.sethi@samsung.com>
Fri, 23 Sep 2016 12:22:15 +0000 (17:52 +0530)
committerAlka Sethi <alka.sethi@samsung.com>
Fri, 23 Sep 2016 12:22:15 +0000 (17:52 +0530)
Change-Id: I42d34e4c690129fbb07d69838c5448026fd8b70d
Signed-off-by: Alka Sethi <alka.sethi@samsung.com>
playview/res/edje/custom/pv-custom-button.edc patch | blob | history
playview/res/edje/pv-normal-control.edc patch | blob | history

diff --git a/playview/res/edje/custom/pv-custom-button.edc b/playview/res/edje/custom/pv-custom-button.edc
index e990051..f5f120f 100644 (file)
--- a/playview/res/edje/custom/pv-custom-button.edc
+++ b/playview/res/edje/custom/pv-custom-button.edc
@@ -2846,24 +2846,6 @@ group {
                        }
                }
                part {
-                       name: "elm.text";
-                       type: TEXT;
-                       mouse_events: 0;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               visible: 0;
-                               rel1 { relative: 0.0 0.0;}
-                               rel2 { relative: 0.0 0.0;}
-                               color: 0 0 0 0;
-                               text {
-                                       font: "Tizen:style=Regular";
-                                       size: 24;
-                                       min: 0 0;
-                               }
-                       }
-               }
-               part {
                        name: "elm.swallow.content";
                        type: SWALLOW;
                        scale: 1;
@@ -2925,7 +2907,25 @@ group {
                                visible: 1;
                        }
                }
-
+               part {
+                       name: "elm.text";
+                       type: TEXT;
+                       mouse_events: 0;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               visible: 1;
+                               align: 0.5 0.5;
+                               rel1 { relative: 0.0 0.7; to:"button_image";}
+                               rel2 { relative: 1.0 1.0; to:"button_image";}
+                               color: 255 255 255 255;
+                               text {
+                                       font: "Tizen:style=Regular";
+                                       size: 10;
+                                       align: 0.5 0.5;
+                               }
+                       }
+               }
                part {
                        name: "over2";
                        type: RECT;
@@ -3067,24 +3067,6 @@ group {
                        }
                }
                part {
-                       name: "elm.text";
-                       type: TEXT;
-                       mouse_events: 0;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               visible: 0;
-                               rel1 { relative: 0.0 0.0;}
-                               rel2 { relative: 0.0 0.0;}
-                               color: 0 0 0 0;
-                               text {
-                                       font: "Tizen:style=Regular";
-                                       size: 24;
-                                       min: 0 0;
-                               }
-                       }
-               }
-               part {
                        name: "elm.swallow.content";
                        type: SWALLOW;
                        scale: 1;
@@ -3146,7 +3128,25 @@ group {
                                visible: 1;
                        }
                }
-
+               part {
+                       name: "elm.text";
+                       type: TEXT;
+                       mouse_events: 0;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               visible: 1;
+                               align: 0.5 0.5;
+                               rel1 { relative: 0.0 0.6;to: "button_image";}
+                               rel2 { relative: 1.0 1.0;to: "button_image";}
+                               color: 0 166 191 255;
+                               text {
+                                       font: "Tizen:style=Regular";
+                                       size: 10;
+                                       align: 0.5 0.5;
+                               }
+                       }
+               }
                part {
                        name: "over2";
                        type: RECT;
diff --git a/playview/res/edje/pv-normal-control.edc b/playview/res/edje/pv-normal-control.edc
index f1816e0..83881ed 100644 (file)
--- a/playview/res/edje/pv-normal-control.edc
+++ b/playview/res/edje/pv-normal-control.edc
@@ -289,8 +289,8 @@ collections {
                                        min: 60 60;
                                        fixed: 1 1;
                                        align: 0.5 0.5;
-                                       rel1 { relative: 0.0 0.5; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +18 0;}
-                                       rel2 { relative: 0.0 0.5; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +78 0;}
+                                       rel1 { relative: 0.05 0.45; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +18 0;}
+                                       rel2 { relative: 0.05 0.45; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: +78 0;}
                                        color: 255 255 255 255;
                                }
                                PV_PART_DESCRIPTION_HIDE
@@ -308,8 +308,8 @@ collections {
                                        min: 60 60;
                                        fixed: 1 1;
                                        align: 0.5 0.5;
-                                       rel1 { relative: 1.0 0.5; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: -18 0;}
-                                       rel2 { relative: 1.0 0.5; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: -78 0;}
+                                       rel1 { relative: 0.95 0.55; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: -18 0;}
+                                       rel2 { relative: 0.95 0.55; to_x: "pv.normal.control.bg"; to_y: "pv.normal.control.toolbar.rect"; offset: -78 0;}
                                        color: 255 255 255 255;
                                }
                                PV_PART_DESCRIPTION_HIDE
Domain: Applications / Multimedia;