From d5d4025ba6f7746b8101517b3807328e2ccbf22f Mon Sep 17 00:00:00 2001 From: prince Date: Mon, 1 Jul 2013 15:07:58 +0530 Subject: [PATCH] [Nocontent] Layout base will resize w.r.t to naviframe content. Change-Id: Id95456ae0f81c05bd865f9bc7b2438054965b0e0 --- themes/inc/tizen-dark-inc.edc | 2 -- themes/inc/tizen-light-inc.edc | 2 -- themes/widgets/layout.edc | 28 ++++------------------------ 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 3d2d083..8ffb874 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -926,8 +926,6 @@ #define NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC 0 96 #define NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC 0 11 #define NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC 312 312 -#define NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC 720 1280 -#define NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC 1280 720 #define ENTRY_TEXT_SIZE_INC 44 #define ENTRY_TEXT_COLOR_INC "#FAFAFA" diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 3869782..eefd259 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -925,8 +925,6 @@ #define NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC 0 96 #define NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC 0 11 #define NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC 312 312 -#define NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC 720 1280 -#define NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC 1280 720 #define ENTRY_TEXT_SIZE_INC 44 #define ENTRY_TEXT_COLOR_INC "#000000" diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc index c230e09..a1327c4 100644 --- a/themes/widgets/layout.edc +++ b/themes/widgets/layout.edc @@ -1441,30 +1441,14 @@ group { type: RECT; scale: 1; description { state: "default" 0.0; - color: NOCONTENT_BG_COLOR_INC; - align: 0.5 1.0; - fixed: 0 1; - min: NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC; - rel1.relative: 0.0 1.0; - } - description { state: "landscape" 0.0; - inherit: "default" 0.0; - min: NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC; - } - } - part { name: "base"; - type: RECT; - description { state: "default" 0.0; visible: 0; fixed: 1 1; min: NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC; rel1 { relative: 0.5 0.5; - to_y: "bg"; } rel2 { relative: 0.5 0.5; - to_y: "bg"; } } } @@ -1475,11 +1459,11 @@ group { align: 0.5 0.0; rel1 { relative: 0.5 0.0; - to: "base"; + to: "bg"; } rel2 { relative: 0.5 0.0; - to: "base"; + to: "bg"; } image { normal: "00_nocontents_picture.png"; @@ -1497,11 +1481,11 @@ group { fixed: 0 1; rel1 { relative: 0.0 1.0; - to: "base"; + to: "bg"; } rel2 { relative: 1.0 1.0; - to: "base"; + to: "bg"; } text { style: "nocontent_style"; @@ -1606,7 +1590,6 @@ group { source: "elm"; signal: "elm,state,orient,90"; action: STATE_SET "landscape" 0.0; - target: "bg"; target: "swallow_area"; target: "elm.help.text"; target: "padding_after_text"; @@ -1616,7 +1599,6 @@ group { source: "elm"; signal: "elm,state,orient,270"; action: STATE_SET "landscape" 0.0; - target: "bg"; target: "swallow_area"; target: "elm.help.text"; target: "padding_after_text"; @@ -1626,7 +1608,6 @@ group { source: "elm"; signal: "elm,state,orient,0"; action: STATE_SET "default" 0.0; - target: "bg"; target: "swallow_area"; target: "elm.help.text"; target: "padding_after_text"; @@ -1636,7 +1617,6 @@ group { source: "elm"; signal: "elm,state,orient,180"; action: STATE_SET "default" 0.0; - target: "bg"; target: "swallow_area"; target: "elm.help.text"; target: "padding_after_text"; -- 2.7.4