rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=222ee1360a8d979f8e9aaaafff12c00cc50d2e3a
commit 222ee1360a8d979f8e9aaaafff12c00cc50d2e3a
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Mon Jul 13 15:03:18 2015 +0300
Styles: update single line entry style
Change-Id: Ica6d95b71d488bd012a0bf759c334ff35e7966a0
---
data/themes/default/images/control-bg-disabled.png | Bin 0 -> 2925 bytes
data/themes/default/images/control-bg.png | Bin 0 -> 2849 bytes
data/themes/default/images/control-focus.png | Bin 0 -> 1124 bytes
data/themes/default/images/control-shadow.png | Bin 0 -> 2921 bytes
data/themes/default/widgets/entry.edc | 271 +++++++++++++++++----
5 files changed, 218 insertions(+), 53 deletions(-)
diff --git a/data/themes/default/images/control-bg-disabled.png
b/data/themes/default/images/control-bg-disabled.png
new file mode 100644
index 0000000..7b726b3
Binary files /dev/null and b/data/themes/default/images/control-bg-disabled.png
differ
diff --git a/data/themes/default/images/control-bg.png
b/data/themes/default/images/control-bg.png
new file mode 100644
index 0000000..7a1e178
Binary files /dev/null and b/data/themes/default/images/control-bg.png differ
diff --git a/data/themes/default/images/control-focus.png
b/data/themes/default/images/control-focus.png
new file mode 100644
index 0000000..49b3a22
Binary files /dev/null and b/data/themes/default/images/control-focus.png differ
diff --git a/data/themes/default/images/control-shadow.png
b/data/themes/default/images/control-shadow.png
new file mode 100644
index 0000000..d262a49
Binary files /dev/null and b/data/themes/default/images/control-shadow.png
differ
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index 86d922d..59f1bd4 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -604,30 +604,53 @@ group { name: "elm/scroller/entry/default";
group { name: "elm/scroller/entry_single/default";
alias: "elm/scroller/entry_single/eflete/search_field";
alias: "elm/scroller/entry_single/fileselector/default";
- images {
- image: "input-text-bg.png" COMP;
- }
data {
item: "focus_highlight" "on";
}
+
+ images {
+ image: "control-bg.png" COMP;
+ image: "control-bg-disabled.png" COMP;
+ image: "control-shadow.png" COMP;
+ image: "control-focus.png" COMP;
+ }
+
parts {
- part { name: "base";
- type: SPACER;
+ part { name: "bg";
+ type: IMAGE;
description { state: "default" 0.0;
- min: 0 20;
- max: -1 20;
+ min: 0 19;
+ max: -1 19;
fixed: 1 1;
+ color_class: "bg_entry";
+ image {
+ normal: "control-bg.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
+ }
+ description { state: "disabled" 0.0;
+ min: 0 19;
+ max: -1 19;
+ fixed: 1 1;
+ image {
+ normal: "control-bg-disabled.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
}
}
part { name: "sb_vbar_base";
type: RECT;
description { state: "default" 0.0;
- fixed: 1 1;
visible: 0;
- rel1.to: "base";
+ fixed: 1 1;
+ rel1 {
+ to: "bg";
+ }
rel2 {
- to: "base";
relative: 1.0 0.0;
+ to: "bg";
}
}
}
@@ -657,10 +680,12 @@ group { name: "elm/scroller/entry_single/default";
visible: 0;
fixed: 1 1;
rel1 {
- to: "base";
relative: 1.0 0.0;
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
}
- rel2.to: "base";
}
}
part { name: "elm.dragable.hbar";
@@ -683,53 +708,36 @@ group { name: "elm/scroller/entry_single/default";
}
}
}
- part { name: "bg";
- type: IMAGE;
- description { state: "default" 0.0;
- align: 0.5 0.5;
- rel1.to: "base";
- rel2.to: "base";
- image {
- normal: "input-text-bg.png";
- border: 5 5 5 5;
- middle: DEFAULT;
- }
- }
- }
- part { name: "clipper";
- type: RECT;
- description { state: "default" 0.0;
- rel1.to: "elm.swallow.background";
- rel2.to: "elm.swallow.background";
- }
- }
part { name: "elm.swallow.background";
type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
rel1 {
- to: "base";
offset: 1 1;
+ to: "bg";
}
rel2 {
- to: "base";
- offset: -2 -2;
+ offset: -2 -3;
+ to: "bg";
}
}
}
part { name: "elm.swallow.content";
type: SWALLOW;
- clip_to: "clipper";
+ clip_to: "content_clipper";
description { state: "default" 0.0;
fixed: 1 1;
rel1 {
relative: 1.0 0.0;
- to: "elm.swallow.icon";
- offset: 5 0;
+ offset: 6 0;
+ to_x: "elm.swallow.icon";
+ to_y: "bg";
}
rel2 {
relative: 0.0 1.0;
- to: "elm.swallow.end";
+ offset: -7 -2;
+ to_x: "elm.swallow.end";
+ to_y: "bg";
}
}
}
@@ -738,12 +746,38 @@ group { name: "elm/scroller/entry_single/default";
clip_to: "clipper";
description { state: "default" 0.0;
rel1 {
- to: "base";
offset: 1 1;
+ to: "bg";
}
rel2 {
- to: "base";
offset: -2 -2;
+ to: "bg";
+ }
+ }
+ }
+ part { name: "clipper";
+ type: RECT;
+ description { state: "default" 0.0;
+ rel1 {
+ to: "elm.swallow.background";
+ }
+ rel2 {
+ to: "elm.swallow.background";
+ }
+ }
+ }
+ part { name: "content_clipper";
+ type: RECT;
+ description { state: "default" 0.0;
+ rel1 {
+ offset: 0 1;
+ to_x: "elm.swallow.content";
+ to_y: "bg";
+ }
+ rel2 {
+ offset: -1 -3;
+ to_x: "elm.swallow.content";
+ to_y: "bg";
}
}
}
@@ -753,16 +787,26 @@ group { name: "elm/scroller/entry_single/default";
description { state: "default" 0.0;
visible: 0;
align: 0.0 0.5;
- max: 0 18;
+ max: 0 -1;
rel1 {
to: "bg";
}
- rel2.to: "bg";
+ rel2 {
+ to: "bg";
+ }
}
description { state: "visible" 0.0;
- inherit: "default" 0.0;
- max: 18 18;
- visible: 1;
+ align: 0.0 0.5;
+ aspect: 1.0 1.0;
+ aspect_preference: VERTICAL;
+ rel1 {
+ offset: 6 1;
+ to: "bg";
+ }
+ rel2 {
+ offset: -1 -3;
+ to: "bg";
+ }
}
}
part { name: "elm.swallow.end";
@@ -771,17 +815,104 @@ group { name: "elm/scroller/entry_single/default";
description { state: "default" 0.0;
visible: 0;
align: 1.0 0.5;
- max: 0 17;
- rel1.to: "bg";
+ max: 0 -1;
+ rel1 {
+ to: "bg";
+ }
rel2 {
offset: -2 -1;
to: "bg";
}
}
description { state: "visible" 0.0;
- inherit: "default" 0.0;
- max: 19 17;
- visible: 1;
+ align: 1.0 0.5;
+ aspect: 1.0 1.0;
+ aspect_preference: VERTICAL;
+ rel1 {
+ offset: 0 1;
+ to: "bg";
+ }
+ rel2 {
+ offset: -7 -3;
+ to: "bg";
+ }
+ }
+ }
+ part { name: "shadow";
+ type: IMAGE;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ rel1 {
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ }
+ image {
+ normal: "control-shadow.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
+ }
+ description { state: "disabled" 0.0;
+ visible: 0;
+ rel1 {
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ }
+ image {
+ normal: "control-shadow.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
+ }
+ }
+ part { name: "focus";
+ type: IMAGE;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel1 {
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ }
+ image {
+ normal: "control-focus.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
+ }
+ description { state: "pass" 0.0;
+ color_class: "valid";
+ rel1 {
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ }
+ image {
+ normal: "control-focus.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
+ }
+ description { state: "fail" 0.0;
+ color_class: "invalid";
+ rel1 {
+ to: "bg";
+ }
+ rel2 {
+ to: "bg";
+ }
+ image {
+ normal: "control-focus.png";
+ border: 8 8 8 8;
+ middle: DEFAULT;
+ }
}
}
}
@@ -814,8 +945,42 @@ group { name: "elm/scroller/entry_single/default";
signal: "load";
source: "";
script {
- emit("reload", "elm");
- }
+
+ emit("reload", "elm");
+ }
+ }
+ program { name: "enable";
+ signal: "elm,state,enable";
+ source: "elm";
+ action: STATE_SET "default" 0.00;
+ target: "bg";
+ target: "shadow";
+ }
+ program { name: "disable";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.00;
+ target: "bg";
+ target: "shadow";
+ target: "focus";
+ }
+ program { name: "validation_pass";
+ signal: "validation,default,pass";
+ source: "elm";
+ action: STATE_SET "pass" 0.00;
+ target: "focus";
+ }
+ program { name: "validation_fail";
+ signal: "validation,default,fail";
+ source: "elm";
+ action: STATE_SET "fail" 0.00;
+ target: "focus";
+ }
+ program { name: "validation_off";
+ signal: "validation,default";
+ source: "elm";
+ action: STATE_SET "default" 0.00;
+ target: "focus";
}
}
}
--
