rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=dfef770ebb12dbeeaaf5a6f7be266283f81783ff
commit dfef770ebb12dbeeaaf5a6f7be266283f81783ff
Author: Mykyta Biliavskyi <m.biliavs...@samsung.com>
Date: Mon Jun 13 20:42:30 2016 +0300
Tizen theme: update colorr_class style for combobox.
---
data/themes/ewe_tizen/widgets/combobox.edc | 373 +++++++--------------
.../ewe_tizen/widgets/images/color_class_img.png | Bin 0 -> 127 bytes
data/themes/tizen/widgets/image.edc | 13 +-
3 files changed, 140 insertions(+), 246 deletions(-)
diff --git a/data/themes/ewe_tizen/widgets/combobox.edc
b/data/themes/ewe_tizen/widgets/combobox.edc
index 5d38d75..24d69a5 100644
--- a/data/themes/ewe_tizen/widgets/combobox.edc
+++ b/data/themes/ewe_tizen/widgets/combobox.edc
@@ -356,13 +356,9 @@ images {
group { name: "ewe/combobox/base/color_class";
images {
- image: "dropdown-bg.png" COMP;
- image: "dropdown-focus-bg.png" COMP;
- image: "dropdown-bg_unactive.png" COMP;
- image: "icon-slidedown.png" COMP;
- image: "icon-slideup.png" COMP;
- image: "color-background-2.png" COMP;
- image: "color-shadow-2.png" COMP;
+ image: "drop_arrow_nor.png" COMP;
+ image: "drop_arrow_sel.png" COMP;
+ image: "color_class_img.png" COMP;
}
min: 76 24;
@@ -407,12 +403,12 @@ group { name: "ewe/combobox/base/color_class";
description { state: "default" 0.0;
max: 9 5;
image.normal: "drop_arrow_nor.png";
+ fill.smooth: 0;
rel1.to: "right.offset";
rel2.to: "right.offset";
}
description { state: "expanded" 0.0;
inherit: "default" 0.00;
- max: 8 4;
image.normal: "drop_arrow_sel.png";
}
}
@@ -424,155 +420,113 @@ group { name: "ewe/combobox/base/color_class";
color: 88 88 88 255;
text {
text: "";
- font: FN;
+ font: "PT";
size: 15;
max: 1 1;
}
rel1.offset: 5 0;
}
}
+ part { name: "bg.color.color1";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 142 142 142 255;
+ rel1.to: "bg.color1";
+ rel2.to: "bg.color1";
+ }
+ }
+ part { name: "bg.color.color2";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 142 142 142 255;
+ rel1.to: "bg.color2";
+ rel2.to: "bg.color2";
+ }
+ }
+ part { name: "bg.color.color3";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 142 142 142 255;
+ rel1.to: "bg.color3";
+ rel2.to: "bg.color3";
+ }
+ }
part { name: "bg.color3";
type: IMAGE;
description { state: "default" 0.0;
align: 1.0 0.5;
- min: 16 13;
- max: 16 13;
- rel1 {
- to: "bg0";
- }
+ min: 11 11;
+ max: 11 11;
+ image.normal: "color_class_img.png";
+ fill.smooth: 0;
+ rel1.to: "bg0";
rel2 {
relative: 0.0 1.0;
offset: -7 -1;
to_x: "right.offset";
to_y: "bg0";
}
- image {
- normal: "color-background-2.png";
- middle: DEFAULT;
- }
}
}
part { name: "bg.color2";
type: IMAGE;
description { state: "default" 0.0;
align: 1.0 0.5;
- min: 16 13;
- max: 16 13;
- rel1 {
- to: "bg0";
- }
+ min: 11 11;
+ max: 11 11;
+ image.normal: "color_class_img.png";
+ fill.smooth: 0;
+ rel1.to: "bg0";
rel2 {
relative: 0.0 1.0;
offset: -6 -1;
to_x: "bg.color3";
to_y: "bg0";
}
- image {
- normal: "color-background-2.png";
- middle: DEFAULT;
- }
}
}
part { name: "bg.color1";
type: IMAGE;
description { state: "default" 0.0;
align: 1.0 0.5;
- min: 16 13;
- max: 16 13;
- rel1 {
- to: "bg0";
- }
+ min: 11 11;
+ max: 11 11;
+ image.normal: "color_class_img.png";
+ fill.smooth: 0;
+ rel1.to: "bg0";
rel2 {
relative: 0.0 1.0;
offset: -6 -1;
to_x: "bg.color2";
to_y: "bg0";
}
- image {
- normal: "color-background-2.png";
- middle: DEFAULT;
- }
}
}
part { name: "swallow.color1";
type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- to: "bg.color1";
- }
- rel2 {
- to: "bg.color1";
- }
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel1.to: "bg.color1";
+ rel2.to: "bg.color1";
}
}
part { name: "swallow.color2";
type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- to: "bg.color2";
- }
- rel2 {
- to: "bg.color2";
- }
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel1.to: "bg.color2";
+ rel2.to: "bg.color2";
}
}
part { name: "swallow.color3";
type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- to: "bg.color3";
- }
- rel2 {
- to: "bg.color3";
- }
- }
- }
- part { name: "shadow.color1";
- type: IMAGE;
- description { state: "default" 0.0;
- rel1 {
- to: "bg.color1";
- }
- rel2 {
- to: "bg.color1";
- }
- image {
- normal: "color-shadow-2.png";
- border: 3 3 3 3;
- middle: DEFAULT;
- }
- }
- }
- part { name: "shadow.color2";
- type: IMAGE;
- description { state: "default" 0.0;
- rel1 {
- to: "bg.color2";
- }
- rel2 {
- to: "bg.color2";
- }
- image {
- normal: "color-shadow-2.png";
- border: 3 3 3 3;
- middle: DEFAULT;
- }
- }
- }
- part { name: "shadow.color3";
- type: IMAGE;
- description { state: "default" 0.0;
- rel1 {
- to: "bg.color3";
- }
- rel2 {
- to: "bg.color3";
- }
- image {
- normal: "color-shadow-2.png";
- border: 3 3 3 3;
- middle: DEFAULT;
- }
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel1.to: "bg.color3";
+ rel2.to: "bg.color3";
}
}
part { name: "expand.btn";
@@ -581,8 +535,8 @@ group { name: "ewe/combobox/base/color_class";
color: 0 0 0 0;
}
description { state: "unvisible" 0.0;
+ inherit: "default" 0.00;
visible: 0;
- color: 0 0 0 0;
}
}
part { name: "disabler";
@@ -590,6 +544,7 @@ group { name: "ewe/combobox/base/color_class";
description { state: "default" 0.0;
}
description { state: "active" 0.0;
+ inherit: "default" 0.00;
color: 64 64 64 225;
}
}
@@ -657,6 +612,7 @@ group { name: "ewe/combobox/base/color_class";
}
}
+
group { name: "ewe/combobox/base/small";
min: 0 21;
max: 21 21;
@@ -1143,6 +1099,7 @@ group {name: "ewe/combobox/item/default";
}
group { name: "ewe/combobox/item/color_class";
+ images.image: "color_class_img.png" COMP;
parts {
part { name: "base";
type: SPACER;
@@ -1158,12 +1115,8 @@ group { name: "ewe/combobox/item/color_class";
align: 1.0 0.5;
min: 10 0;
max: 10 -1;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
+ rel1.to: "base";
+ rel2.to: "base";
}
}
part { name: "padding.left.text";
@@ -1172,33 +1125,20 @@ group { name: "ewe/combobox/item/color_class";
align: 0.0 0.5;
min: 10 0;
max: 10 -1;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
+ rel1.to: "base";
+ rel2.to: "base";
}
}
part { name: "highlight";
type: RECT;
description { state: "default" 0.0;
- color: TRANSPARENT_COLOR;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
+ color: 0 0 0 0;
+ rel1.to: "base";
+ rel2.to: "base";
}
description { state: "focused" 0.0;
+ inherit: "default" 0.00;
color: 203 233 255 255;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
}
}
part { name: "ewe.text";
@@ -1207,26 +1147,11 @@ group { name: "ewe/combobox/item/color_class";
description { state: "default" 0.0;
align: 0.0 0.5;
color: 85 85 85 255;
- rel1 {
- relative: 1.0 0.0;
- to_x: "padding.left.text";
- to_y: "base";
- }
- rel2 {
- relative: 0.0 1.0;
- offset: -7 -1;
- to_x: "bg.color1";
- to_y: "base";
- }
text {
- font: FN;
+ font: "PT";
size: 12;
max: 1 1;
}
- }
- description { state: "focused" 0.0;
- align: 0.0 0.5;
- color: 85 85 85 255;
rel1 {
relative: 1.0 0.0;
to_x: "padding.left.text";
@@ -1238,164 +1163,121 @@ group { name: "ewe/combobox/item/color_class";
to_x: "bg.color1";
to_y: "base";
}
- text {
- font: FN;
- size: 12;
- max: 1 1;
- }
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.00;
+ }
+ }
+ part { name: "bg.color.color1";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 142 142 142 255;
+ rel1.to: "bg.color1";
+ rel2.to: "bg.color1";
+ }
+ }
+ part { name: "bg.color.color2";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 142 142 142 255;
+ rel1.to: "bg.color2";
+ rel2.to: "bg.color2";
+ }
+ }
+ part { name: "bg.color.color3";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 142 142 142 255;
+ rel1.to: "bg.color3";
+ rel2.to: "bg.color3";
}
}
part { name: "bg.color3";
type: IMAGE;
description { state: "default" 0.0;
align: 1.0 0.5;
- min: 16 13;
- max: 16 13;
- rel1 {
- to: "base";
- }
+ min: 11 11;
+ max: 11 11;
+ image.normal: "color_class_img.png";
+ fill.smooth: 0;
+ rel1.to: "base";
rel2 {
relative: 0.0 1.0;
offset: -7 -1;
to_x: "padding.right.text";
to_y: "base";
}
- image {
- normal: "color-background-2.png";
- middle: DEFAULT;
- }
}
}
part { name: "bg.color2";
type: IMAGE;
description { state: "default" 0.0;
align: 1.0 0.5;
- min: 16 13;
- max: 16 13;
- rel1 {
- to: "base";
- }
+ min: 11 11;
+ max: 11 11;
+ image.normal: "color_class_img.png";
+ fill.smooth: 0;
+ rel1.to: "base";
rel2 {
relative: 0.0 1.0;
offset: -6 -1;
to_x: "bg.color3";
to_y: "base";
}
- image {
- normal: "color-background-2.png";
- middle: DEFAULT;
- }
}
}
part { name: "bg.color1";
type: IMAGE;
description { state: "default" 0.0;
align: 1.0 0.5;
- min: 16 13;
- max: 16 13;
- rel1 {
- to: "base";
- }
+ min: 11 11;
+ max: 11 11;
+ image.normal: "color_class_img.png";
+ fill.smooth: 0;
+ rel1.to: "base";
rel2 {
relative: 0.0 1.0;
offset: -6 -1;
to_x: "bg.color2";
to_y: "base";
}
- image {
- normal: "color-background-2.png";
- middle: DEFAULT;
- }
}
}
part { name: "swallow.color1";
type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- to: "bg.color1";
- }
- rel2 {
- to: "bg.color1";
- }
+ rel1.to: "bg.color1";
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel2.to: "bg.color1";
}
}
part { name: "swallow.color2";
type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- to: "bg.color2";
- }
- rel2 {
- to: "bg.color2";
- }
+ rel1.to: "bg.color2";
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel2.to: "bg.color2";
}
}
part { name: "swallow.color3";
type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- to: "bg.color3";
- }
- rel2 {
- to: "bg.color3";
- }
- }
- }
- part { name: "shadow.color1";
- type: IMAGE;
- description { state: "default" 0.0;
- rel1 {
- to: "bg.color1";
- }
- rel2 {
- to: "bg.color1";
- }
- image {
- normal: "color-shadow-2.png";
- middle: DEFAULT;
- }
- }
- }
- part { name: "shadow.color2";
- type: IMAGE;
- description { state: "default" 0.0;
- rel1 {
- to: "bg.color2";
- }
- rel2 {
- to: "bg.color2";
- }
- image {
- normal: "color-shadow-2.png";
- middle: DEFAULT;
- }
- }
- }
- part { name: "shadow.color3";
- type: IMAGE;
- description { state: "default" 0.0;
- rel1 {
- to: "bg.color3";
- }
- rel2 {
- to: "bg.color3";
- }
- image {
- normal: "color-shadow-2.png";
- middle: DEFAULT;
- }
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel1.to: "bg.color3";
+ rel2.to: "bg.color3";
}
}
part { name: "event";
type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
- rel1 {
- to: "base";
- }
- rel2 {
- to: "base";
- }
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ rel1.to: "base";
+ rel2.to: "base";
}
}
}
@@ -1421,6 +1303,7 @@ group { name: "ewe/combobox/item/color_class";
}
}
}
+
group { name: "ewe/combobox/base/history";
min: 9 9;
max: 9 9;
diff --git a/data/themes/ewe_tizen/widgets/images/color_class_img.png
b/data/themes/ewe_tizen/widgets/images/color_class_img.png
new file mode 100644
index 0000000..0272e99
Binary files /dev/null and
b/data/themes/ewe_tizen/widgets/images/color_class_img.png differ
diff --git a/data/themes/tizen/widgets/image.edc
b/data/themes/tizen/widgets/image.edc
index d37520a..2165248 100644
--- a/data/themes/tizen/widgets/image.edc
+++ b/data/themes/tizen/widgets/image.edc
@@ -17,7 +17,6 @@
} \
}
-IM("color", "color_set", "color-set.png", -1 -1, 7 7 6 7,
SCALE, SOLID)
IM("icon", "rectangle", "icon-rectangle.png", 16 16, 0 0 0 0,
SCALE, SOLID)
IM("icon", "rectangle1", "icon-rectangle1.png", 16 16, 0 0 0 0,
SCALE, SOLID)
IM("icon", "rectangle2", "icon-rectangle2.png", 16 16, 0 0 0 0,
SCALE, SOLID)
@@ -144,3 +143,15 @@ group { name: "elm/image/icon/scale_larger";
}
}
}
+
+group { name: "elm/image/color/color_set";
+ parts {
+ part { name: "image";
+ type: RECT;
+ description { state: "default" 0.0;
+ }
+ }
+ }
+}
+
+
--
