cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=7db06cb64aa691bb85bd604de6c5928cf442b737
commit 7db06cb64aa691bb85bd604de6c5928cf442b737 Author: Hosang Kim <[email protected]> Date: Mon Jan 4 14:52:50 2016 -0800 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 <[email protected]> --- data/themes/colorclasses.edc | 8 ++++++-- data/themes/edc/elm/entry.edc | 3 ++- data/themes/edc/elm/scroller.edc | 3 ++- data/themes/edc/scrollframe.edc | 2 +- src/examples/evas3d_map_example.edc | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc index 33f6f82..a67d445 100644 --- a/data/themes/colorclasses.edc +++ b/data/themes/colorclasses.edc @@ -227,9 +227,13 @@ color_classes { color: WIN_DEFAULT_BASIC; desc: "Base of a frame widget"; } - color_class { name: "scrollframe_base"; + color_class { name: "scroller_bg"; color: WIN_DEFAULT_BASIC; - desc: "Base of a scroller widget"; + desc: "Background of a scroller widget"; + } + color_class { name: "scroller_bar"; + color: 255 255 255 255; + desc: "Bar of a scroller widget"; } color_class { name: "spinner_bg"; color: 0 0 0 0; diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc index 7214080..9a97a03 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"; description { state: "default" 0.0; rel1.to: "elm.swallow.background"; rel2.to: "elm.swallow.background"; - color_class: "entry_scrollframe_base"; + color: DARK_GREY_BG_COLOR; + color_class: "scroller_bg"; } } part { name: "clipper"; type: RECT; diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc index 34fa910..27b267c 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"; rel2.to: "elm.swallow.background"; // color: 64 64 64 200; color: 0 0 0 0; - color_class: "scrollframe_base"; + color_class: "scroller_bg`"; } } part { name: "clipper"; type: RECT; @@ -925,6 +925,7 @@ group { name: "elm/scroller/base/default"; min: 3 13; TILED_HORIZ(120) fixed: 1 1; + color_class: "scroller_bar"; } } part { name: "bevel_vbar"; mouse_events: 0; diff --git a/data/themes/edc/scrollframe.edc b/data/themes/edc/scrollframe.edc index 5d2ce9e..0a04cc9 100644 --- a/data/themes/edc/scrollframe.edc +++ b/data/themes/edc/scrollframe.edc @@ -339,7 +339,7 @@ group { name: "e/widgets/scrollframe"; rel1.to: "e.swallow.content"; rel2.to: "e.swallow.content"; color: 64 64 64 255; - color_class: "scrollframe_base"; + color_class: "scroller_bg"; } } part { name: "clipper"; type: RECT; diff --git a/src/examples/evas3d_map_example.edc b/src/examples/evas3d_map_example.edc index c9261a2..06a409d 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"; rel2.to: "elm.swallow.background"; // color: 64 64 64 200; color: 0 0 0 0; - color_class: "scrollframe_base"; + color_class: "scroller_bg"; } } part { name: "clipper"; type: RECT; --
