summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2016-01-04 14:52:50 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 14:54:31 -0800
commit7db06cb64aa691bb85bd604de6c5928cf442b737 (patch)
treefdc341c03875c82e79ead11cf702d790cd1b1620
parente06d9bc332fb4e6313318639b85008325a569c94 (diff)
scroller: add color classes
Summary: The following new color classes for scroller widget are added and changed. Reviewers: raster, cedric, Hermet, kimcinoo, woohyun Differential Revision: https://phab.enlightenment.org/D3493 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/colorclasses.edc8
-rw-r--r--data/themes/edc/elm/entry.edc3
-rw-r--r--data/themes/edc/elm/scroller.edc3
-rw-r--r--data/themes/edc/scrollframe.edc2
-rw-r--r--src/examples/evas3d_map_example.edc2
5 files changed, 12 insertions, 6 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 33f6f8231..a67d4450b 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -227,9 +227,13 @@ color_classes {
227 color: WIN_DEFAULT_BASIC; 227 color: WIN_DEFAULT_BASIC;
228 desc: "Base of a frame widget"; 228 desc: "Base of a frame widget";
229 } 229 }
230 color_class { name: "scrollframe_base"; 230 color_class { name: "scroller_bg";
231 color: WIN_DEFAULT_BASIC; 231 color: WIN_DEFAULT_BASIC;
232 desc: "Base of a scroller widget"; 232 desc: "Background of a scroller widget";
233 }
234 color_class { name: "scroller_bar";
235 color: 255 255 255 255;
236 desc: "Bar of a scroller widget";
233 } 237 }
234 color_class { name: "spinner_bg"; 238 color_class { name: "spinner_bg";
235 color: 0 0 0 0; 239 color: 0 0 0 0;
diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc
index 7214080f2..9a97a0343 100644
--- a/data/themes/edc/elm/entry.edc
+++ b/data/themes/edc/elm/entry.edc
@@ -214,7 +214,8 @@ group { name: "elm/scroller/entry_single/default";
214 description { state: "default" 0.0; 214 description { state: "default" 0.0;
215 rel1.to: "elm.swallow.background"; 215 rel1.to: "elm.swallow.background";
216 rel2.to: "elm.swallow.background"; 216 rel2.to: "elm.swallow.background";
217 color_class: "entry_scrollframe_base"; 217 color: DARK_GREY_BG_COLOR;
218 color_class: "scroller_bg";
218 } 219 }
219 } 220 }
220 part { name: "clipper"; type: RECT; 221 part { name: "clipper"; type: RECT;
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index 34fa9103c..27b267c54 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -694,7 +694,7 @@ group { name: "elm/scroller/base/default";
694 rel2.to: "elm.swallow.background"; 694 rel2.to: "elm.swallow.background";
695// color: 64 64 64 200; 695// color: 64 64 64 200;
696 color: 0 0 0 0; 696 color: 0 0 0 0;
697 color_class: "scrollframe_base"; 697 color_class: "scroller_bg`";
698 } 698 }
699 } 699 }
700 part { name: "clipper"; type: RECT; 700 part { name: "clipper"; type: RECT;
@@ -925,6 +925,7 @@ group { name: "elm/scroller/base/default";
925 min: 3 13; 925 min: 3 13;
926 TILED_HORIZ(120) 926 TILED_HORIZ(120)
927 fixed: 1 1; 927 fixed: 1 1;
928 color_class: "scroller_bar";
928 } 929 }
929 } 930 }
930 part { name: "bevel_vbar"; mouse_events: 0; 931 part { name: "bevel_vbar"; mouse_events: 0;
diff --git a/data/themes/edc/scrollframe.edc b/data/themes/edc/scrollframe.edc
index 5d2ce9e18..0a04cc938 100644
--- a/data/themes/edc/scrollframe.edc
+++ b/data/themes/edc/scrollframe.edc
@@ -339,7 +339,7 @@ group { name: "e/widgets/scrollframe";
339 rel1.to: "e.swallow.content"; 339 rel1.to: "e.swallow.content";
340 rel2.to: "e.swallow.content"; 340 rel2.to: "e.swallow.content";
341 color: 64 64 64 255; 341 color: 64 64 64 255;
342 color_class: "scrollframe_base"; 342 color_class: "scroller_bg";
343 } 343 }
344 } 344 }
345 part { name: "clipper"; type: RECT; 345 part { name: "clipper"; type: RECT;
diff --git a/src/examples/evas3d_map_example.edc b/src/examples/evas3d_map_example.edc
index c9261a2cf..06a409dc6 100644
--- a/src/examples/evas3d_map_example.edc
+++ b/src/examples/evas3d_map_example.edc
@@ -450,7 +450,7 @@ group { name: "elm/scroller/base/evas3d";
450 rel2.to: "elm.swallow.background"; 450 rel2.to: "elm.swallow.background";
451// color: 64 64 64 200; 451// color: 64 64 64 200;
452 color: 0 0 0 0; 452 color: 0 0 0 0;
453 color_class: "scrollframe_base"; 453 color_class: "scroller_bg";
454 } 454 }
455 } 455 }
456 part { name: "clipper"; type: RECT; 456 part { name: "clipper"; type: RECT;