diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index dd94555808..516d796e50 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -156,6 +156,11 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg/normal/naviframe/top/overlap"; color: 255 255 255 200; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/colorselector"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/colorselector/pattern"; + color: 48 48 48 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/layout/content-back/title"; color: 255 255 255 255; } diff --git a/data/elementary/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc index 7d66da3fc8..f26f8b711a 100644 --- a/data/elementary/themes/edc/elm/bg.edc +++ b/data/elementary/themes/edc/elm/bg.edc @@ -35,25 +35,6 @@ group { name: "elm/bg/base/default"; } } -#define PAT_FILL_SCALE(_w, _h) \ - part { name: "_pat_sizer"; type: SPACER; \ - scale: 1; \ - description { state: "default" 0.0; \ - rel2.relative: 0.0 0.0; \ - fixed: 1 1; \ - min: 100 100; max: 100 100; \ - } \ - } \ - program { signal: "resize"; source: ""; \ - script { \ - new x, y, w, h; \ - get_geometry(PART:"_pat_sizer", x, y, w, h); \ - custom_state(PART:"pat", "default", 0.0); \ - set_state_val(PART:"pat", STATE_FILL_SIZE, 0, 0, (w*_w)/100, (h*_h)/100); \ - set_state(PART:"pat", "custom", 0.0); \ - } \ - } - #define BG_PAT(_name, _img, _w, _h, _colbg, _colfg) \ group { name: _name; \ data.item: "version" "119"; \ @@ -115,7 +96,6 @@ BG_PAT("elm/bg/base/checks_big_light", "checks.png", 320, 320, "/bg-light/norm BG_PAT("elm/bg/base/checks_small_light", "checks.png", 80, 80, "/bg-light/normal/background", "/bg-light-alt/normal/background") #undef BG_PAT -#undef PAT_FILL_SCALE #define BG_GRADV(_name, _colbg, _colfg) \ group { name: _name; \ diff --git a/data/elementary/themes/edc/elm/colorsel.edc b/data/elementary/themes/edc/elm/colorsel.edc index e552a27012..cef531f1f9 100644 --- a/data/elementary/themes/edc/elm/colorsel.edc +++ b/data/elementary/themes/edc/elm/colorsel.edc @@ -22,7 +22,7 @@ group { name: "elm/colorselector/palette/default"; rel2.offset: -6 2; min: 64 1; max: 99999 1; - color: 72 72 72 255; + color_class: "/fg/normal/separator/horizontal"; offscale; } description { state: "off" 0.0; @@ -62,7 +62,7 @@ group { name: "elm/colorselector/palette/default"; rel2.relative: 1.0 0.0; min: 64 1; max: 99999 1; - color: 72 72 72 255; + color_class: "/fg/normal/separator/horizontal"; offscale; } description { state: "off" 0.0; @@ -126,6 +126,7 @@ group { name: "elm/colorselector/palette/default"; group { name: "elm/colorselector/picker/base/default"; parts { part { name: "elm.swallow.picker"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; min: 80 80; rel2 { @@ -173,7 +174,7 @@ group { name: "elm/colorselector/picker/base/default"; font: FN; size: 10; ellipsis: -1; } - color: 160 160 160 255; + color_class: "/fg/normal/colorselector/text/r"; offscale; } } @@ -203,7 +204,7 @@ group { name: "elm/colorselector/picker/base/default"; font: FN; size: 10; ellipsis: -1; } - color: 160 160 160 255; + color_class: "/fg/normal/colorselector/text/g"; offscale; } } @@ -237,7 +238,7 @@ group { name: "elm/colorselector/picker/base/default"; font: FN; size: 10; ellipsis: -1; } - color: 160 160 160 255; + color_class: "/fg/normal/colorselector/text/b"; offscale; } } @@ -271,7 +272,7 @@ group { name: "elm/colorselector/picker/base/default"; font: FN; size: 10; ellipsis: -1; } - color: 160 160 160 255; + color_class: "/fg/normal/colorselector/text/a"; offscale; } } @@ -291,22 +292,22 @@ group { name: "elm/colorselector/picker/base/default"; } group { name: "elm/colorselector/picker/default"; - images.image: "diagonal_stripes.png" COMP; + images.image: "stripes-diag.png" COMP; parts { part { name: "bg"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 16 16; + min: 40 40; rel.to: "elm.picker"; - color: 32 32 32 255; + color_class: "/bg/normal/colorselector"; } } + PAT_FILL_SCALE(160, 160) part { name: "pat"; description { state: "default" 0.0; rel.to: "bg"; - image.normal: "diagonal_stripes.png"; - color: 255 255 255 16; - TILED_PATTERN(240, 240) + image.normal: "stripes-diag.png"; + color_class: "/bg/normal/colorselector/pattern"; } } part { name: "clipper"; type: RECT; @@ -367,6 +368,7 @@ group { name: "elm/colorselector/bg/default"; } group { name: "elm/colorselector/base/default"; + images.image: "stripes-diag.png" COMP; parts { part { name: "elm.bar_bg"; type: SWALLOW; mouse_events: 0; scale: 1; @@ -416,7 +418,7 @@ group { name: "elm/colorselector/base/default"; rel1.to: "elm.arrow_icon"; rel2.to_x: "elm.arrow_icon"; rel2.to_y: "elm.arrow_bg"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } dragable.events: "elm.arrow"; } @@ -452,23 +454,23 @@ group { name: "elm/colorselector/base/default"; min: 24 24; max: 24 24; fixed: 1 1; - color: 255 255 255 255; + color_class: "/fg/normal/colorselector/cursor"; } } part { name: "arrow_base"; type: RECT; clip_to: "arrow_clip"; description { state: "default" 0.0; rel.to: "arrow_bg"; - color: 32 32 32 255; + color_class: "/bg/normal/colorselector"; } } - part { name: "arrow_pat"; + PAT_FILL_SCALE(160, 160) + part { name: "pat"; clip_to: "arrow_clip"; description { state: "default" 0.0; rel.to: "arrow_bg"; - image.normal: "diagonal_stripes.png"; - color: 255 255 255 16; - TILED_PATTERN(240, 240) + image.normal: "stripes-diag.png"; + color_class: "/bg/normal/colorselector/pattern"; } } part { name: "arrow_clip"; @@ -511,7 +513,7 @@ group { name: "elm/colorselector/base/default"; rel2.to_y: "elm.bar"; rel2.relative: 0.5 1.0; rel2.offset: 0 -1; - color: 255 255 255 255; + color_class: "/fg/normal/colorselector/cursor"; } dragable.events: "elm.arrow"; } @@ -519,7 +521,7 @@ group { name: "elm/colorselector/base/default"; repeat_events: 1; description { state: "default" 0.0; rel.to: "elm.arrow_bg"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -530,7 +532,7 @@ group { name: "elm/colorselector/arrow/default"; part { name: "base"; type: RECT; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } } @@ -581,50 +583,51 @@ group { name: "elm/colorselector/image/colorbar_3/default"; } group { name: "elm/colorselector/bg_image/colorbar_3/default"; - images.image: "diagonal_stripes.png" COMP; + images.image: "stripes-diag.png" COMP; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - color: 32 32 32 255; + color_class: "/bg/normal/colorselector"; } } + PAT_FILL_SCALE(160, 160) part { name: "pat"; description { state: "default" 0.0; rel.to: "bg"; - image.normal: "diagonal_stripes.png"; - color: 255 255 255 16; - TILED_PATTERN(240, 240) + image.normal: "stripes-diag.png"; + color_class: "/bg/normal/colorselector/pattern"; } } } } group { name: "elm/colorselector/item/default"; - images.image: "diagonal_stripes.png" COMP; + images.image: "stripes-diag.png" COMP; parts { part { name: "sel"; type: RECT; description { state: "default" 0.0; - color: 51 153 255 0; + color_class: "/bg/selected/colorselector"; + color: 255 255 255 0; // no cc } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; // no cc } } part { name: "bg"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 16 16; + min: 20 20; rel.to: "color_obj"; - color: 32 32 32 255; + color_class: "/bg/normal/colorselector"; } } + PAT_FILL_SCALE(160, 160) part { name: "pat"; description { state: "default" 0.0; rel.to: "bg"; - image.normal: "diagonal_stripes.png"; - color: 255 255 255 16; - TILED_PATTERN(240, 240) + image.normal: "stripes-diag.png"; + color_class: "/bg/normal/colorselector/pattern"; } } part { name: "clipper"; type: RECT; @@ -633,7 +636,7 @@ group { name: "elm/colorselector/item/default"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } alias: "color_obj" "elm.swallow.color_obj"; @@ -641,7 +644,7 @@ group { name: "elm/colorselector/item/default"; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; - min: 16 16; + min: 20 20; rel1.offset: 5 5; rel2.offset: -6 -6; offscale; diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index 5f69d1ba7e..0bf051e7e6 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -26,6 +26,25 @@ image { image: "p-1280.png" BACKGROUND_COMP; size: 0 0 1280 720; } \ } +#define PAT_FILL_SCALE(_w, _h) \ + part { name: "_pat_sizer"; type: SPACER; \ + scale: 1; \ + description { state: "default" 0.0; \ + rel2.relative: 0.0 0.0; \ + fixed: 1 1; \ + min: 100 100; max: 100 100; \ + } \ + } \ + program { signal: "resize"; source: ""; \ + script { \ + new x, y, w, h; \ + get_geometry(PART:"_pat_sizer", x, y, w, h); \ + custom_state(PART:"pat", "default", 0.0); \ + set_state_val(PART:"pat", STATE_FILL_SIZE, 0, 0, (w*_w)/100, (h*_h)/100); \ + set_state(PART:"pat", "custom", 0.0); \ + } \ + } + #define DARK_GREY_BG_COLOR 48 48 48 255 #define DARK_GREY_BG_DISABLED_COLOR 64 64 64 255