rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=43415650b54263f8d6887cf15b03d8cfaf1b41d9
commit 43415650b54263f8d6887cf15b03d8cfaf1b41d9
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Tue May 31 16:58:58 2016 +0300
TIZEN: base layout of inwin managers according to UIUX guide line
---
data/themes/tizen/widgets/inwin.edc | 2 +-
data/themes/tizen/widgets/layouts/manager.edc | 100 +++++++++-----------------
2 files changed, 36 insertions(+), 66 deletions(-)
diff --git a/data/themes/tizen/widgets/inwin.edc
b/data/themes/tizen/widgets/inwin.edc
index 9f2d010..e395b4b 100644
--- a/data/themes/tizen/widgets/inwin.edc
+++ b/data/themes/tizen/widgets/inwin.edc
@@ -134,7 +134,7 @@ group { name: "elm/win/inwin/modal_window";
}
rel2 {
relative: 1.0 0.0;
- offset: -21 -20;
+ offset: -21 -21;
to_x: "base";
to_y: "separator.buttons";
}
diff --git a/data/themes/tizen/widgets/layouts/manager.edc
b/data/themes/tizen/widgets/layouts/manager.edc
index 3724366..22f3985 100644
--- a/data/themes/tizen/widgets/layouts/manager.edc
+++ b/data/themes/tizen/widgets/layouts/manager.edc
@@ -13,41 +13,22 @@ group { name: "elm/layout/manager/internal";
size: 13;
max: 1 0;
}
- rel1.offset: 0 2;
- rel2 {
- offset: -7 -1;
- }
+ rel2.offset: -7 -1;
}
}
part { name: "elm.swallow.preview";
type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- align: 0.0 0.5;
+ align: 0.0 0.0;
fixed: 1 0;
+ max: -1 173;
rel1 {
relative: 0.0 1.0;
- offset: 0 6;
+ offset: 0 8;
to_y: "elm.text";
}
- rel2 {
- relative: 1.0 0.0;
- offset: -4 -4;
- to_y: "elm.swallow.menu";
- }
- }
- }
- part { name: "elm.swallow.menu";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- fixed: 0 1;
- max: -1 19;
- rel2 {
- relative: 1.0 0.45;
- to_x: "elm.swallow.preview";
- }
+ rel2.offset: -4 -1;
}
}
part { name: "elm.swallow.list";
@@ -58,46 +39,26 @@ group { name: "elm/layout/manager/internal";
fixed: 1 0;
rel1 {
relative: 0.0 1.0;
- offset: 0 3;
- to_y: "elm.subtext";
+ to_y: "elm.swallow.search";
}
- rel2.offset: -4 -4;
+ rel2.offset: -4 -1;
}
}
- part { name: "elm.subtext";
- type: TEXT;
+ part { name: "elm.swallow.btn_del";
+ type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- align: 0.0 0.0;
- max: -1 34;
- color_class: "genlist_text_tree";
- text {
- font: FN;
- size: 13;
- max: 1 0;
- }
+ align: 1.0 0.0;
+ min: 24 0;
+ max: 24 23;
rel1 {
relative: 0.0 1.0;
- offset: 0 3;
- to_x: "elm.swallow.list";
- to_y: "elm.swallow.menu";
+ offset: 0 15;
+ to_y: "elm.swallow.preview";
}
rel2 {
- relative: 0.0 1.0;
- to_x: "elm.swallow.btn_add";
- }
- }
- }
- part { name: "elm.swallow.btn_del";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- max: 18 19;
- rel1.to_y: "elm.subtext";
- rel2 {
- to_y: "elm.subtext";
offset: -4 -1;
+ to_y: "elm.swallow.search";
}
}
}
@@ -105,31 +66,40 @@ group { name: "elm/layout/manager/internal";
type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- align: 1.0 0.5;
- max: 18 19;
- rel1.to_y: "elm.subtext";
+ align: 1.0 0.0;
+ min: 24 23;
+ max: 24 23;
+ rel1 {
+ relative: 0.0 1.0;
+ offset: 0 15;
+ to_y: "elm.swallow.preview";
+ }
rel2 {
relative: 0.0 1.0;
- offset: -4 -1;
+ offset: -6 -1;
to_x: "elm.swallow.btn_del";
- to_y: "elm.subtext";
+ to_y: "elm.swallow.search";
}
}
}
+ /* all changes below just because entry weirdly add
+ 5 pixels to top and bottom, so we need to fit entry perfectly */
part { name: "elm.swallow.search";
type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
- max: 300 34;
+ max: -1 30;
rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to: "elm.subtext";
+ relative: 0.0 1.0;
+ offset: 0 10;
+ to_x: "elm.swallow.list";
+ to_y: "elm.swallow.preview";
}
rel2 {
- offset: -1 -7;
- to_y: "elm.subtext";
+ relative: 0.0 1.0;
+ offset: -10 4;
+ to_x: "elm.swallow.btn_add";
}
}
}
--
