From 563b1484d900935e91294f60cff690916bb66973 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 27 Jul 2016 22:53:41 +0900 Subject: [PATCH] Revert "theme: set clipper size properly." This reverts commit 895984f8f53ba5e45b32a7dec3b02a7f03dd32f5. Eeek, this broke dim effects! --- data/themes/default/layout_common.edc | 36 ++++++++++++-------------- data/themes/default/layout_setting.edc | 9 +++---- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index 707cb59..206aad3 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -19,27 +19,23 @@ group { "fileselector_layout"; rect { "clipper"; desc { "default"; color: 127 127 127 127; - min: 650 435; - max: 600 435; - fixed: 1 1; } desc { "show"; - inherit: "default"; color: 255 255 255 255; } } rect { "bg"; clip_to: "clipper"; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 175; } } image { "base_frame_img"; scale: 1; clip_to: "clipper"; desc { - rel1.to: "clipper"; - rel2.to: "clipper"; + min: 650 435; + max: 600 435; fixed: 1 1; image.normal: "frame_bg.png"; image.border: 10 10 10 10; @@ -211,12 +207,8 @@ group { "newfile_layout"; rect { "clipper"; desc { "default"; color: 127 127 127 127; - min: 650 435; - max: 600 435; - fixed: 1 1; } desc { "show"; - inherit: "default"; color: 255 255 255 255; } } @@ -230,8 +222,8 @@ group { "newfile_layout"; scale: 1; clip_to: "clipper"; desc { - rel1.to: "clipper"; - rel2.to: "clipper"; + min: 650 435; + max: 650 435; fixed: 1 1; image.normal: "frame_bg.png"; image.border: 10 10 10 10; @@ -389,12 +381,8 @@ group { "warning_layout"; rect { "clipper"; desc { "default"; color: 127 127 127 127; - min: 300 135; - max: 300 135; - fixed: 1 1; } desc {state: "show"; - inherit: "default"; color: 255 255 255 255; } } @@ -408,8 +396,8 @@ group { "warning_layout"; scale: 1; clip_to: "clipper"; desc { - rel1.to: "clipper"; - rel2.to: "clipper"; + min: 300 135; + max: 300 135; fixed: 1 1; image.normal: "frame_bg.png"; image.border: 10 10 10 10; @@ -790,6 +778,16 @@ group { "menu_layout"; fixed: 1 1; } } + spacer { "padding7"; + scale: 1; + desc { "default"; + rel1.relative: 1 1; + rel2.offset: -10 -1; + min: 20 20; + fixed: 1 1; + align: 1 1; + } + } swallow { "elm.swallow.back_button"; scale: 1; clip_to: "clipper"; diff --git a/data/themes/default/layout_setting.edc b/data/themes/default/layout_setting.edc index d1c672a..72ff376 100644 --- a/data/themes/default/layout_setting.edc +++ b/data/themes/default/layout_setting.edc @@ -9,16 +9,13 @@ group { "setting_layout"; rect { "clipper"; desc { state: "default"; color: 127 127 127 127; - min: 650 435; - max: 600 435; - fixed: 1 1; } desc { state: "show"; - inherit: "default"; color: 255 255 255 255; } } rect { "bg"; + clip_to: "clipper"; desc { state: "default"; color: 0 0 0 175; } @@ -27,8 +24,8 @@ group { "setting_layout"; scale: 1; clip_to: "clipper"; desc { - rel1.to: "clipper"; - rel2.to: "clipper"; + min: 650 435; + max: 600 435; fixed: 1 1; image.normal: "frame_bg.png"; image.border: 10 10 10 10;