raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=a27ca10cb7554cf40ec5a284f82df7c82d1039f7
commit a27ca10cb7554cf40ec5a284f82df7c82d1039f7
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Mon Oct 14 16:44:44 2013 +0900
reviewed layouts... a bit.
---
edje/dark.edc | 3 +-
edje/edc/elm/layout.edc | 188 +++++++++++++++++++-----------------------------
2 files changed, 75 insertions(+), 116 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 2513de6..334dcf3 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -54,7 +54,6 @@ collections {
#include "edc/elm/map.edc"
#include "edc/elm/index.edc"
#include "edc/elm/calendar.edc"
-// XXX: review (layout)
#include "edc/elm/layout.edc"
// XXX: support multi progress (progressbar)
#include "edc/elm/progress.edc"
@@ -62,7 +61,7 @@ collections {
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
-// XXX: min size calc problems - too wide!
+// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
#include "edc/elm/clock.edc"
diff --git a/edje/edc/elm/layout.edc b/edje/edc/elm/layout.edc
index 3f5b56e..902d82b 100644
--- a/edje/edc/elm/layout.edc
+++ b/edje/edc/elm/layout.edc
@@ -1,8 +1,7 @@
/* application with a main content area with a back button and title area */
group { name: "elm/layout/application/content-back";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to_y: "title_clipper";
@@ -11,8 +10,7 @@ group { name: "elm/layout/application/content-back";
}
}
}
- part { name: "title_clipper";
- type: RECT;
+ part { name: "title_clipper"; type: RECT;
description { state: "default" 0.0;
visible: 1;
rel1.to_y: "back";
@@ -24,8 +22,7 @@ group { name: "elm/layout/application/content-back";
rel2.relative: 1.0 0.0;
}
}
- part { name: "back_clipper";
- type: RECT;
+ part { name: "back_clipper"; type: RECT;
clip_to: "title_clipper";
description { state: "default" 0.0;
visible: 1;
@@ -34,8 +31,7 @@ group { name: "elm/layout/application/content-back";
visible: 0;
}
}
- part { name: "back";
- type: EXTERNAL;
+ part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
description { state: "default" 0.0;
@@ -54,38 +50,32 @@ group { name: "elm/layout/application/content-back";
}
programs {
program {
- signal: "clicked";
- source: "back";
+ signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
program {
- signal: "elm,back,hide";
- source: "elm";
+ signal: "elm,back,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "back_clipper";
}
program {
- signal: "elm,back,show";
- source: "elm";
+ signal: "elm,back,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "back_clipper";
}
program {
- signal: "elm,title,hide";
- source: "elm";
+ signal: "elm,title,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
transition: LINEAR 0.1;
target: "title_clipper";
}
program {
- signal: "elm,title,show";
- source: "elm";
+ signal: "elm,title,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "title_clipper";
}
}
- part { name: "elm.swallow.end";
- type: SWALLOW;
+ part { name: "elm.swallow.end"; type: SWALLOW;
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
@@ -99,9 +89,8 @@ group { name: "elm/layout/application/content-back";
}
}
}
- part { name: "elm.text.title";
- type: TEXT;
- effect: SOFT_SHADOW;
+ part { name: "elm.text.title"; type: TEXT;
+ effect: SHADOW BOTTOM;
scale: 1;
clip_to: "title_clipper";
description { state: "default" 0.0;
@@ -110,14 +99,15 @@ group { name: "elm/layout/application/content-back";
relative: 1.0 0.0;
offset: 2 1;
}
- rel2 { to_y: "back";
+ rel2 {
+ to_y: "back";
to_x: "elm.swallow.end";
relative: 0.0 1.0;
offset: -3 -1;
}
- text {
- font: "Sans:style=Bold";
- size: 12;
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ text { font: FNBD; size: 10;
}
}
}
@@ -127,8 +117,7 @@ group { name: "elm/layout/application/content-back";
/* application with a main content area with a back and next buttons and title
area */
group { name: "elm/layout/application/content-back-next";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to_y: "title_clipper";
@@ -137,8 +126,7 @@ group { name: "elm/layout/application/content-back-next";
}
}
}
- part { name: "title_clipper";
- type: RECT;
+ part { name: "title_clipper"; type: RECT;
description { state: "default" 0.0;
visible: 1;
rel1.to_y: "back";
@@ -150,8 +138,7 @@ group { name: "elm/layout/application/content-back-next";
rel2.relative: 1.0 0.0;
}
}
- part { name: "back";
- type: EXTERNAL;
+ part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
description { state: "default" 0.0;
@@ -168,8 +155,7 @@ group { name: "elm/layout/application/content-back-next";
params.string: "label" "Back";
}
}
- part { name: "back_clipper";
- type: RECT;
+ part { name: "back_clipper"; type: RECT;
clip_to: "title_clipper";
description { state: "default" 0.0;
visible: 1;
@@ -178,8 +164,7 @@ group { name: "elm/layout/application/content-back-next";
visible: 0;
}
}
- part { name: "next";
- type: EXTERNAL;
+ part { name: "next"; type: EXTERNAL;
source: "elm/button";
clip_to: "next_clipper";
description { state: "default" 0.0;
@@ -196,8 +181,7 @@ group { name: "elm/layout/application/content-back-next";
params.string: "label" "Next";
}
}
- part { name: "next_clipper";
- type: RECT;
+ part { name: "next_clipper"; type: RECT;
clip_to: "title_clipper";
description { state: "default" 0.0;
visible: 1;
@@ -208,56 +192,47 @@ group { name: "elm/layout/application/content-back-next";
}
programs {
program {
- signal: "clicked";
- source: "back";
+ signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
program {
- signal: "elm,title,hide";
- source: "elm";
+ signal: "elm,title,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
transition: LINEAR 0.1;
target: "title_clipper";
}
program {
- signal: "elm,title,show";
- source: "elm";
+ signal: "elm,title,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "title_clipper";
}
program {
- signal: "elm,back,hide";
- source: "elm";
+ signal: "elm,back,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "back_clipper";
}
program {
- signal: "elm,back,show";
- source: "elm";
+ signal: "elm,back,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "back_clipper";
}
program {
- signal: "clicked";
- source: "next";
+ signal: "clicked"; source: "next";
action: SIGNAL_EMIT "elm,action,next" "elm";
}
program {
- signal: "elm,next,hide";
- source: "elm";
+ signal: "elm,next,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "next_clipper";
}
program {
- signal: "elm,next,show";
- source: "elm";
+ signal: "elm,next,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "next_clipper";
}
}
- part { name: "elm.text.title";
- type: TEXT;
- effect: SOFT_SHADOW;
+ part { name: "elm.text.title"; type: TEXT;
+ effect: SHADOW BOTTOM;
scale: 1;
clip_to: "title_clipper";
description { state: "default" 0.0;
@@ -272,9 +247,9 @@ group { name: "elm/layout/application/content-back-next";
relative: 0.0 1.0;
offset: -3 -1;
}
- text {
- font: "Sans:style=Bold";
- size: 12;
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ text { font: FNBD; size: 10;
}
}
}
@@ -284,8 +259,7 @@ group { name: "elm/layout/application/content-back-next";
/* application with toolbar and main content area */
group { name: "elm/layout/application/toolbar-content";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to_y: "elm.external.toolbar";
@@ -294,15 +268,14 @@ group { name: "elm/layout/application/toolbar-content";
}
}
}
- part { name: "elm.external.toolbar";
- type: EXTERNAL;
+ part { name: "elm.external.toolbar"; type: EXTERNAL;
source: "elm/toolbar";
description { state: "default" 0.0;
align: 0.5 0.0;
fixed: 0 1;
rel2 {
relative: 1.0 0.0;
- offset: -1 47;
+ offset: -1 0;
}
}
}
@@ -313,8 +286,7 @@ group { name: "elm/layout/application/toolbar-content";
group { name: "elm/layout/application/toolbar-content-back";
inherit: "elm/layout/application/content-back";
parts {
- part { name: "elm.external.toolbar";
- type: EXTERNAL;
+ part { name: "elm.external.toolbar"; type: EXTERNAL;
insert_after: "elm.swallow.content";
source: "elm/toolbar";
description { state: "default" 0.0;
@@ -322,7 +294,7 @@ group { name: "elm/layout/application/toolbar-content-back";
align: 0.5 0.0;
rel2 {
relative: 1.0 0.0;
- offset: -1 47;
+ offset: -1 0;
}
}
}
@@ -365,15 +337,14 @@ group { name:
"elm/layout/application/toolbar-content-back";
group { name: "elm/layout/application/toolbar-content-back-next";
inherit: "elm/layout/application/content-back-next";
parts {
- part { name: "elm.external.toolbar";
- type: EXTERNAL;
+ part { name: "elm.external.toolbar"; type: EXTERNAL;
source: "elm/toolbar";
description { state: "default" 0.0;
fixed: 0 1;
align: 0.5 0.0;
rel2 {
relative: 1.0 0.0;
- offset: -1 47;
+ offset: -1 0;
}
}
}
@@ -415,26 +386,24 @@ group { name:
"elm/layout/application/toolbar-content-back-next";
/* application with toolbar and main content area as a vertical box */
group { name: "elm/layout/application/toolbar-vbox";
parts {
- part { name: "elm.box.content";
- type: BOX;
+ part { name: "elm.box.content"; type: BOX;
description { state: "default" 0.0;
rel1 {
to_y: "elm.external.toolbar";
relative: 0.0 1.0;
- offset: -1 1;
+ offset: -1 0;
}
box.layout: "vertical";
}
}
- part { name: "elm.external.toolbar";
- type: EXTERNAL;
+ part { name: "elm.external.toolbar"; type: EXTERNAL;
source: "elm/toolbar";
description { state: "default" 0.0;
align: 0.5 0.0;
fixed: 0 1;
rel2 {
relative: 1.0 0.0;
- offset: -1 47;
+ offset: -1 0;
}
}
}
@@ -444,25 +413,23 @@ group { name: "elm/layout/application/toolbar-vbox";
/* application with toolbar and main content area as a table */
group { name: "elm/layout/application/toolbar-table";
parts {
- part { name: "elm.table.content";
- type: TABLE;
+ part { name: "elm.table.content"; type: TABLE;
description { state: "default" 0.0;
rel1 {
to_y: "elm.external.toolbar";
relative: 0.0 1.0;
- offset: -1 1;
+ offset: -1 0;
}
}
}
- part { name: "elm.external.toolbar";
- type: EXTERNAL;
+ part { name: "elm.external.toolbar"; type: EXTERNAL;
source: "elm/toolbar";
description { state: "default" 0.0;
align: 0.5 0.0;
fixed: 0 1;
rel2 {
relative: 1.0 0.0;
- offset: -1 47;
+ offset: -1 0;
}
}
}
@@ -472,30 +439,29 @@ group { name: "elm/layout/application/toolbar-table";
/* a simple title layout, with a label and two icons */
group { name: "elm/layout/application/titlebar";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to_y: "elm.swallow.icon";
relative: 0.0 1.0;
- offset: -1 1;
+ offset: -1 0;
}
}
}
- part { name: "elm.swallow.icon";
- type: SWALLOW;
+ part { name: "elm.swallow.icon"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
align: 0.0 0.0;
+ min: 24 24;
rel1 {
relative: 0.0 0.0;
- offset: 4 0;
+ offset: 2 2;
}
rel2 {
relative: 0.0 0.0;
- offset: 5 32;
+ offset: 2 2;
}
}
description { state: "visible" 0.0;
@@ -503,20 +469,20 @@ group { name: "elm/layout/application/titlebar";
visible: 1;
}
}
- part { name: "elm.swallow.end";
- type: SWALLOW;
+ part { name: "elm.swallow.end"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
align: 1.0 0.0;
+ min: 24 24;
rel1 {
relative: 1.0 0.0;
- offset: -5 0;
+ offset: -3 2;
}
rel2 {
relative: 1.0 0.0;
- offset: -4 -1;
+ offset: -3 2;
}
}
description { state: "visible" 0.0;
@@ -525,34 +491,29 @@ group { name: "elm/layout/application/titlebar";
}
}
programs {
- program { name: "show_icon";
- signal: "elm,state,icon,visible";
- source: "elm";
+ program {
+ signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
- program { name: "hide_icon";
- signal: "elm,state,icon,hidden";
- source: "elm";
+ program {
+ signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
}
- program { name: "show_end";
- signal: "elm,state,end,visible";
- source: "elm";
+ program {
+ signal: "elm,state,end,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.end";
}
- program { name: "hide_end";
- signal: "elm,state,end,hidden";
- source: "elm";
+ program {
+ signal: "elm,state,end,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.end";
}
}
- part { name: "elm.text";
- type: TEXT;
- effect: SOFT_SHADOW;
+ part { name: "elm.text"; type: TEXT;
+ effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1 {
@@ -563,13 +524,12 @@ group { name: "elm/layout/application/titlebar";
to: "elm.swallow.end";
relative: 0.0 1.0;
}
- text {
- font: "Sans";
- size: 12;
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ text { font: FNBD; size: 10;
}
}
}
}
-
}
--
