From: ChunEon Park Date: Wed, 12 Jun 2013 05:13:08 +0000 (+0900) Subject: naviframe - clip the previous page to not be visible in panes case. X-Git-Tag: submit/tizen/20131004.114939~218 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8084a96522e7c1a1acbee5de1df5f2bf423800a;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git naviframe - clip the previous page to not be visible in panes case. Change-Id: I71dcebcee4f8f88b14777a63c24a31cb79adbb97 --- diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc index d002733..fcf4967 100644 --- a/themes/widgets/naviframe.edc +++ b/themes/widgets/naviframe.edc @@ -32,6 +32,15 @@ public landscape = 0; //Landscape mode status } parts { + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + visible: 1; + } + description { state: "left" 0.0; + visible: 0; + } + } part { name: "base"; type: RECT; mouse_events: 0; @@ -74,6 +83,7 @@ part { name: "title_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; rel1 { to_y: "title_bg"; } rel2 { to_y: "title_bg"; } @@ -166,6 +176,7 @@ part { name: "content_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; rel1.to_y: "elm.swallow.content"; rel2.to_y: "elm.swallow.content"; @@ -692,6 +703,7 @@ part { name: "toolbar_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; rel1 { to_y: "toolbar_bg"; } rel2 { to_y: "toolbar_bg"; } @@ -768,6 +780,7 @@ source: "elm"; action: STATE_SET "left" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "pushed_finished"; } @@ -776,6 +789,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "show_finished"; } @@ -1220,6 +1234,15 @@ public landscape = 0; //Landscape mode status } parts { + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + visible: 1; + } + description { state: "left" 0.0; + visible: 0; + } + } part { name: "base"; type: RECT; mouse_events: 0; @@ -1262,9 +1285,10 @@ part { name: "title_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1 { to: "title_bg"; } - rel2 { to: "title_bg"; } + rel1 { to_y: "title_bg"; } + rel2 { to_y: "title_bg"; } } } part { name: "elm.swallow.content"; @@ -1285,9 +1309,10 @@ part { name: "content_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to_y: "elm.swallow.content"; + rel2.to_y: "elm.swallow.content"; } } part { name: "top_padding"; @@ -1541,9 +1566,10 @@ part { name: "toolbar_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1 { to: "toolbar_bg"; } - rel2 { to: "toolbar_bg"; } + rel1 { to_y: "toolbar_bg"; } + rel2 { to_y: "toolbar_bg"; } } } part { name: "toolbar_button1"; @@ -1618,6 +1644,7 @@ source: "elm"; action: STATE_SET "left" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "pushed_finished"; } @@ -1626,6 +1653,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "show_finished"; } @@ -1935,6 +1963,15 @@ public landscape = 0; //Landscape mode status } parts { + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + visible: 1; + } + description { state: "left" 0.0; + visible: 0; + } + } part { name: "base"; type: RECT; mouse_events: 0; @@ -1977,9 +2014,10 @@ part { name: "title_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1 { to: "title_bg"; } - rel2 { to: "title_bg"; } + rel1 { to_y: "title_bg"; } + rel2 { to_y: "title_bg"; } } } part { name: "tabbar"; @@ -2019,9 +2057,10 @@ part { name: "content_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to_y: "elm.swallow.content"; + rel2.to_y: "elm.swallow.content"; } } part { name: "toolbar_bg"; @@ -2110,9 +2149,10 @@ part { name: "toolbar_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1 { to: "toolbar_bg"; } - rel2 { to: "toolbar_bg"; } + rel1 { to_y: "toolbar_bg"; } + rel2 { to_y: "toolbar_bg"; } } } part { name: "toolbar_btns_area"; @@ -2195,6 +2235,7 @@ source: "elm"; action: STATE_SET "left" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "pushed_finished"; } @@ -2203,6 +2244,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "show_finished"; } @@ -2504,6 +2546,15 @@ public landscape = 0; //Landscape mode status } parts { + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + visible: 1; + } + description { state: "left" 0.0; + visible: 0; + } + } part { name: "base"; type: RECT; mouse_events: 0; @@ -2554,6 +2605,7 @@ part { name: "content_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; @@ -2562,6 +2614,7 @@ part { name: "title"; type: SWALLOW; scale: 1; + clip_to: "clipper"; description { state: "default" 0.0; align: 0.5 0.0; fixed: 0 1; @@ -2662,6 +2715,7 @@ part { name: "toolbar_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; rel1 { to: "toolbar_bg"; } rel2 { to: "toolbar_bg"; } @@ -2747,6 +2801,7 @@ source: "elm"; action: STATE_SET "left" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "pushed_finished"; } @@ -2755,6 +2810,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "show_finished"; } @@ -3147,6 +3203,15 @@ public landscape = 0; //Landscape mode status } parts { + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + visible: 1; + } + description { state: "left" 0.0; + visible: 0; + } + } part { name: "base"; type: RECT; mouse_events: 0; @@ -3189,9 +3254,10 @@ part { name: "title_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1 { to: "title_bg"; } - rel2 { to: "title_bg"; } + rel1 { to_y: "title_bg"; } + rel2 { to_y: "title_bg"; } } } part { name: "top_padding"; @@ -3258,9 +3324,10 @@ part { name: "content_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to_y: "elm.swallow.content"; + rel2.to_y: "elm.swallow.content"; } } part { name: "padding_bottom_text"; @@ -3826,9 +3893,10 @@ part { name: "toolbar_clip"; type: RECT; mouse_events: 0; + clip_to: "clipper"; description { state: "default" 0.0; - rel1 { to: "toolbar_bg"; } - rel2 { to: "toolbar_bg"; } + rel1 { to_y: "toolbar_bg"; } + rel2 { to_y: "toolbar_bg"; } } } part { name: "toolbar_button1"; @@ -3902,6 +3970,7 @@ source: "elm"; action: STATE_SET "left" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "pushed_finished"; } @@ -3910,6 +3979,7 @@ source: "elm"; action: STATE_SET "default" 0.0; target: "base"; + target: "clipper"; transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME; after: "show_finished"; }