From 397821a3a4dbbd067ed600be9557314d65a502fc Mon Sep 17 00:00:00 2001 From: Mykyta Biliavskyi Date: Wed, 16 Mar 2016 14:50:14 +0900 Subject: [PATCH] Layout: change behaviuor for hide edc_navigator swallow object. When edc.navigator swallow is hidden it placed outside main markup. --- data/themes/default/layout_common.edc | 41 ++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index 5c8712e..d47cb4f 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -2583,11 +2583,21 @@ group { name: "main_layout"; scale: 1; desc { "default"; rel1.relative: 0 1; - rel2.relative: 0 0; - rel2.to: "elm.swallow.edc_navigator"; + rel2.relative: 1 0; rel1.to_y: "elm.swallow.tools"; rel2.to_y: "elm.swallow.statusbar"; } + desc { "visible"; + rel1 { + relative: 0.0 1.0; + to_y: "elm.swallow.tools"; + } + rel2 { + relative: 0.0 0.0; + to_x: "elm.swallow.edc_navigator"; + to_y: "elm.swallow.statusbar"; + } + } } part { name: "error_alert"; type: RECT; @@ -2621,16 +2631,25 @@ group { name: "main_layout"; scale: 1; desc { "default"; rel1.relative: 1 1; - rel2.relative: 1 0; + rel2.relative: 1.5 0; rel1.to_y: "elm.swallow.tools"; rel2.to_y: "elm.swallow.statusbar"; align: 1 0; min: 0 0; + max: 0 -1; fixed: 1 0; } desc { "visible"; inherit: "default"; min: 200 0; + rel1 { + relative: 1.0 1.0; + to_y: "elm.swallow.tools"; + } + rel2 { + relative: 1.0 0.0; + to_y: "elm.swallow.statusbar"; + } } } } @@ -2644,9 +2663,23 @@ group { name: "main_layout"; program { "edc_navigator_hide"; signal: "elm,state,edc_navigator,hide"; action: STATE_SET "default" 0.0; - target: "elm.swallow.edc_navigator"; + target: "elm.swallow.panes"; transition: DECELERATE 0.25; } + program { name: "navigator_hide"; + signal: "elm,state,edc_navigator,hide"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.25; + in: 0.05 0.0; + target: "elm.swallow.edc_navigator"; + } + program { name: "navigator_show"; + signal: "elm,state,edc_navigator,show"; + action: STATE_SET "visible" 0.0; + transition: LINEAR 0.25; + in: 0.05 0.0; + target: "elm.swallow.panes"; + } program { name: "statusbar_show"; signal: "elm,state,statusbar,show"; action: STATE_SET "visible" 0.0;