From f7449d802c69ae339e0d766b398e27492bc2675d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 29 Apr 2021 01:05:03 +0100 Subject: [PATCH] elm theme - begin applying colorclasses --- data/elementary/themes/colorclasses.edc | 82 +++++++++++++++++++++- data/elementary/themes/edc/about-e.edc | 55 +++++++-------- data/elementary/themes/edc/about-theme.edc | 63 +++++++---------- data/elementary/themes/edc/appmenu.edc | 9 +-- data/elementary/themes/edc/backlight.edc | 12 ++-- data/elementary/themes/edc/elm/access.edc | 10 +-- data/elementary/themes/edc/elm/bg.edc | 48 ++++++------- 7 files changed, 171 insertions(+), 108 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 0af1fc4875..537b26f5ed 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -1,6 +1,86 @@ +color_classes { +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg"; + color: 64 64 64 255; description: "Base background"; } + color_class { name: "/bg-alt"; + color: 56 56 56 255; description: "Base background alternate"; } + color_class { name: "/bg-dark"; + color: 32 32 32 255; description: "Base background dark"; } + color_class { name: "/bg-dark-alt"; + color: 28 28 28 255; description: "Base background dark alternate"; } + color_class { name: "/bg-light"; + color: 192 192 192 255; description: "Base background light"; } + color_class { name: "/bg-light-alt"; + color: 184 184 184 255; description: "Base background light alternate"; } + color_class { name: "/bg/selected"; + color: 51 153 255 255; description: "Base background - selected"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg"; + color: 160 160 160 255; description: "Base foreground"; } + color_class { name: "/fg/selected"; + color: 255 255 255 255; description: "Base foreground - selected"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/shadow"; + color: 0 0 0 128; description: "Base shadow"; } + color_class { name: "/shadow/pressed"; + color: 0 0 0 255; description: "Base shadow - pressed"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/dim"; + color: 0 0 0 200; description: "Base dimming area"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/access"; + color: 255 153 51 64; description: "Access background"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/titlebar"; + color: 64 64 64 255; description: "Titlebar background"; } + color_class { name: "/bg/selected/titlebar"; + color: 32 32 32 255; description: "Titlebar background - selected"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/entry"; + color: 48 48 48 255; description: "Entry background"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/text-heading"; + color: 255 255 255 255; description: "Heading text foreground"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/text-heading-sub"; + color: 255 255 255 255; description: "Sub-Heading text foreground"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/text-hilight"; + color: 255 255 255 255; description: "Hilight text foreground"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/text-overlay"; + color: 160 160 160 255; description: "Overlay text foreground"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/text-subtle"; + color: 0 0 0 64; description: "Overlay text foreground"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/button"; + color: 96 96 96 255; description: "Button background"; } + color_class { name: "/bg/pressed/button"; + color: 80 80 80 255; description: "Button background - pressed"; } + color_class { name: "/fg/normal/button"; + color: 192 192 192 255; description: "Button foreground"; } + color_class { name: "/fg/pressed/button"; + color: 255 255 255 255; description: "Button foreground - pressed"; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/menu/item"; + color: 32 32 32 0; description: "Menu item background"; } + color_class { name: "/bg/selected/menu/item"; + color: 32 32 32 255; description: "Menu item background - selected"; } + color_class { name: "/fg/normal/menu/item"; + color: 160 160 160 255; description: "Menu item foreground"; } + color_class { name: "/fg/selected/menu/item"; + color: 255 255 255 255; description: "Menu item foreground"; } + + + + + + + + #define WIN_DEFAULT_BASIC 255 255 255 255 -color_classes { // comp color_class { name: "comp_focus-out_color"; color: 255 255 255 255; diff --git a/data/elementary/themes/edc/about-e.edc b/data/elementary/themes/edc/about-e.edc index ba3d82989f..335af392ab 100644 --- a/data/elementary/themes/edc/about-e.edc +++ b/data/elementary/themes/edc/about-e.edc @@ -13,15 +13,15 @@ group { name: "e/widgets/about/main"; } styles { style { name: "about_style"; - base: "font="FN" font_size=10 align=center text_class=tb_plain color=#fff wrap=word"; - tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff align=center"; + base: "font="FN" font_size=10 align=center text_class=e-about color=cc:/fg/normal/text-overlay wrap=word"; + tag: "hilight" "+ font="FNBD" text_class=tb_light color=cc:/fg/normal/text-hilight align=center"; tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big"; tag: "/title" "- \n \n"; tag: "br" "\n"; } style { name: "authors_style"; - base: "font="FNBD" font_size=10 align=left text_class=tb_plain color=#0004 wrap=none"; - tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff"; + base: "font="FNBD" font_size=10 align=left text_class=e-about-authors color=cc:/fg/normal/text-subtle wrap=none"; + tag: "hilight" "+ font="FNBD" text_class=tb_light color=cc:/fg/normal/text-hilight"; tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big"; tag: "/title" "- \n \n"; tag: "br" "\n"; @@ -35,19 +35,10 @@ group { name: "e/widgets/about/main"; min: 320 420; } } -/* - part { name: "image"; - description { state: "default" 0.0; - fixed: 1 1; - image.normal: "snow.jpg"; - aspect: 1.0 1.0; aspect_preference: NONE; - } - } - */ part { name: "image"; type: RECT; description { state: "default" 0.0; fixed: 1 1; - color: 48 48 48 255; + color_class: "/bg/normal/entry"; } } //////////////////////////////////////////////////////////////// @@ -138,11 +129,11 @@ group { name: "e/widgets/about/main"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.0; fill.smooth: 1; - color: 64 64 64 255; + color_class: "/bg/normal/titlebar"; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 32 32 32 255; + color_class: "/bg/selected/titlebar"; } } //////////////////////////////////////////////////////////////// @@ -168,9 +159,8 @@ group { name: "e/widgets/about/main"; rel2.offset: -1 13; rel1.relative: 0.0 1.0; rel2.relative: 1.0 1.0; - rel1.to: "logo"; - rel2.to: "logo"; - color: 255 255 255 255; + rel.to: "logo"; + color_class: "/fg/normal/text-heading"; text { font: FNBD; size: 16; min: 1 1; ellipsis: -1; @@ -188,9 +178,8 @@ group { name: "e/widgets/about/main"; rel2.offset: -1 13; rel1.relative: 0.0 1.0; rel2.relative: 1.0 1.0; - rel1.to: "e.text.title"; - rel2.to: "e.text.title"; - color: 255 255 255 255; + rel.to: "e.text.title"; + color_class: "/fg/normal/text-heading-sub"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -209,7 +198,7 @@ group { name: "e/widgets/about/main"; image.normal: "about-triangles.png"; \ aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \ rel1.relative: 0.0 1.0; \ - color: 64 64 64 255; \ + color_class: "/bg/normal/background"; \ offscale; \ } \ } @@ -228,13 +217,15 @@ group { name: "e/widgets/about/main"; description { state: "default" 0.0; rel.to: "base"; WIN_SHADOW_SMALL; + color_class: "/shadow/normal"; offscale; } description { state: "clicked" 0.0; inherit; - image.border_scale_by: 0.25; - rel1.offset: -5 -3; - rel2.offset: 4 6; + image.border_scale_by: 0.125; + rel1.offset: -2 -1; + rel2.offset: 1 2; + color_class: "/shadow/pressed"; } } part { name: "base"; type: RECT; @@ -244,12 +235,14 @@ group { name: "e/widgets/about/main"; rel1.to: "e.text.label"; rel2.offset: 5 5; rel2.to: "e.text.label"; - color: 51 153 255 255; + color_class: "/bg/normal/button"; offscale; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 153 51 255; + rel1.offset: -5 -5; + rel2.offset: 4 4; + color_class: "/bg/pressed/button"; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; @@ -259,7 +252,7 @@ group { name: "e/widgets/about/main"; rel1.relative: 0.5 1.0; rel2.offset: -1 -19; rel2.relative: 0.5 1.0; - color: 255 255 255 255; + color_class: "/fg/normal/button"; align: 0.5 1.0; min: 80 10; text { font: FN; size: 10; @@ -271,16 +264,18 @@ group { name: "e/widgets/about/main"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/button"; } } program { signal: "mouse,down,1*"; source: "base"; action: STATE_SET "clicked" 0.0; + target: "e.text.label"; target: "base"; target: "shadow"; } program { signal: "mouse,up,1"; source: "base"; action: STATE_SET "default" 0.0; + target: "e.text.label"; target: "base"; target: "shadow"; } diff --git a/data/elementary/themes/edc/about-theme.edc b/data/elementary/themes/edc/about-theme.edc index ea4c293e20..9486a88b52 100644 --- a/data/elementary/themes/edc/about-theme.edc +++ b/data/elementary/themes/edc/about-theme.edc @@ -11,27 +11,6 @@ group { name: "e/theme/about"; min: 220 320; } } -/* - part { name: "bg"; type: RECT; - description { state: "default" 0.0; - color: 64 64 64 255; - } - } - part { name: "check"; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - color: 56 56 56 255; - image.normal: "check_fill.png"; - min: 5120 5120; - align: 0.0 0.0; - fill { - size.relative: 0.05 0.05; - smooth: 0; - } - } - } - */ part { name: "image"; description { state: "default" 0.0; fixed: 1 1; @@ -43,7 +22,7 @@ group { name: "e/theme/about"; scale: 1; description { state: "default" 0.0; fixed: 1 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; text { font: FNBD; size: 48; @@ -59,7 +38,7 @@ group { name: "e/theme/about"; scale: 1; description { state: "default" 0.0; fixed: 1 1; - color: 255 255 255 192; + color: 255 255 255 192; // no cc rel.to: "name"; rel1.relative: 0.0 1.0; rel1.offset: 0 16; @@ -81,13 +60,15 @@ group { name: "e/theme/about"; description { state: "default" 0.0; rel.to: "base"; WIN_SHADOW_SMALL; + color_class: "/shadow/normal"; offscale; } description { state: "clicked" 0.0; inherit; - image.border_scale_by: 0.25; - rel1.offset: -5 -3; - rel2.offset: 4 6; + image.border_scale_by: 0.125; + rel1.offset: -2 -1; + rel2.offset: 1 2; + color_class: "/shadow/pressed"; } } part { name: "base"; type: RECT; @@ -96,12 +77,14 @@ group { name: "e/theme/about"; rel.to: "e.text.label"; rel1.offset: -6 -6; rel2.offset: 5 5; - color: 51 153 255 255; + color_class: "/bg/normal/button"; offscale; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 153 51 255; + rel1.offset: -5 -5; + rel2.offset: 4 4; + color_class: "/bg/pressed/button"; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; @@ -111,7 +94,7 @@ group { name: "e/theme/about"; rel1.relative: 1.0 1.0; rel2.offset: -14 -14; rel2.relative: 1.0 1.0; - color: 255 255 255 255; + color_class: "/fg/normal/button"; align: 1.0 1.0; min: 85 0; text { font: FN; size: 10; @@ -125,7 +108,7 @@ group { name: "e/theme/about"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/button"; } } program { signal: "mouse,down,1*"; source: "base"; @@ -149,13 +132,15 @@ group { name: "e/theme/about"; description { state: "default" 0.0; rel.to: "base2"; WIN_SHADOW_SMALL; + color_class: "/shadow/normal"; offscale; } description { state: "clicked" 0.0; inherit; - image.border_scale_by: 0.25; - rel1.offset: -5 -3; - rel2.offset: 4 6; + image.border_scale_by: 0.125; + rel1.offset: -2 -1; + rel2.offset: 1 2; + color_class: "/shadow/pressed"; } } part { name: "base2"; type: RECT; @@ -163,11 +148,13 @@ group { name: "e/theme/about"; rel.to: "e.text.theme"; rel1.offset: -6 -6; rel2.offset: 5 5; - color: 51 153 255 255; + color_class: "/bg/normal/button"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 153 51 255; + rel1.offset: -5 -5; + rel2.offset: 4 4; + color_class: "/bg/pressed/button"; } } part { name: "e.text.theme"; type: TEXT; mouse_events: 0; @@ -177,7 +164,7 @@ group { name: "e/theme/about"; rel1.relative: 0.0 1.0; rel2.offset: 13 -14; rel2.relative: 0.0 1.0; - color: 255 255 255 255; + color_class: "/fg/normal/button"; align: 0.0 1.0; min: 85 0; text { font: FN; size: 10; @@ -191,17 +178,19 @@ group { name: "e/theme/about"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/button"; } } program { signal: "mouse,down,1*"; source: "base2"; action: STATE_SET "clicked" 0.0; target: "base2"; + target: "shadow2"; target: "e.text.theme"; } program { signal: "mouse,up,1"; source: "base2"; action: STATE_SET "default" 0.0; target: "base2"; + target: "shadow2"; target: "e.text.theme"; } program { signal: "mouse,clicked,1*"; source: "base2"; diff --git a/data/elementary/themes/edc/appmenu.edc b/data/elementary/themes/edc/appmenu.edc index e51edc2394..c8e4efdd99 100644 --- a/data/elementary/themes/edc/appmenu.edc +++ b/data/elementary/themes/edc/appmenu.edc @@ -4,11 +4,12 @@ group { name: "e/modules/appmenu/item"; parts { part { name: "background"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 32 32 32 255; + color_class: "/bg/normal/menu/item"; visible: 0; } description { state: "selected" 0.0; inherit: "default" 0.0; + color_class: "/bg/selected/menu/item"; visible: 1; } } @@ -17,7 +18,7 @@ group { name: "e/modules/appmenu/item"; description { state: "default" 0.0; rel1.offset: 4 4; rel2.offset: -5 -5; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -27,12 +28,12 @@ group { name: "e/modules/appmenu/item"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/menu/item"; } } part { name: "event_area"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } diff --git a/data/elementary/themes/edc/backlight.edc b/data/elementary/themes/edc/backlight.edc index c97f042371..fbf5739cfe 100644 --- a/data/elementary/themes/edc/backlight.edc +++ b/data/elementary/themes/edc/backlight.edc @@ -18,29 +18,27 @@ group { name: "e/modules/backlight/main"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: "bulb_middle.png"; - color: 32 32 32 255; + color_class: "/bg-dark/normal/gadgets/backlight"; } } part { name: "glow"; description { state: "default" 0.0; - rel1.to: "base"; + rel.to: "base"; rel1.relative: 0.5 0.5; - rel2.to: "base"; rel2.relative: 0.5 0.5; image.normal: "bulb_middle.png"; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "full" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "over"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; image.normal: "bulb_over.png"; } } diff --git a/data/elementary/themes/edc/elm/access.edc b/data/elementary/themes/edc/elm/access.edc index 4bac5cc12b..c2f4e4b997 100644 --- a/data/elementary/themes/edc/elm/access.edc +++ b/data/elementary/themes/edc/elm/access.edc @@ -2,7 +2,7 @@ group { name: "elm/access/base/default"; parts { part { name: "block1"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 200; + color_class: "/dim/normal/access"; fixed: 0 1; rel1.to: "base"; rel1.offset: -100000 -100000; @@ -13,7 +13,7 @@ group { name: "elm/access/base/default"; } part { name: "block2"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 200; + color_class: "/dim/normal/access"; fixed: 0 1; rel1.to: "base"; rel1.relative: 0.0 1.0; @@ -24,7 +24,7 @@ group { name: "elm/access/base/default"; } part { name: "block3"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 200; + color_class: "/dim/normal/access"; rel1.to: "block1"; rel1.relative: 0.0 1.0; rel1.offset: 0 0; @@ -36,7 +36,7 @@ group { name: "elm/access/base/default"; } part { name: "block4"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 200; + color_class: "/dim/normal/access"; rel1.to_x: "base"; rel1.to_y: "block1"; rel1.relative: 1.0 1.0; @@ -50,7 +50,7 @@ group { name: "elm/access/base/default"; description { state: "default" 0.0; rel1.offset: -20 -20; rel2.offset: 19 19; - color: 255 153 51 64; + color_class: "/bg/normal/access"; } } } diff --git a/data/elementary/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc index 5700a7427f..7d66da3fc8 100644 --- a/data/elementary/themes/edc/elm/bg.edc +++ b/data/elementary/themes/edc/elm/bg.edc @@ -15,7 +15,7 @@ group { name: "elm/bg/base/default"; } part { name: "base"; type: RECT; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/background"; } } part { name: "elm.swallow.rectangle"; type: SWALLOW; @@ -66,14 +66,14 @@ group { name: _name; \ } \ part { name: "base"; type: RECT; \ description { state: "default" 0.0; \ - color: _colbg; \ + color_class: _colbg; \ } \ } \ part { name: "pat"; \ scale: 1; \ description { state: "default" 0.0; \ image.normal: _img; \ - color: _colfg; \ + color_class: _colfg; \ } \ } \ part { name: "elm.swallow.rectangle"; type: SWALLOW; \ @@ -93,26 +93,26 @@ group { name: _name; \ } \ } -BG_PAT("elm/bg/base/stripes", "stripes-diag.png", 160, 160, 64 64 64 255, 80 80 80 255) -BG_PAT("elm/bg/base/stripes_big", "stripes-diag-big.png", 160, 160, 64 64 64 255, 80 80 80 255) +BG_PAT("elm/bg/base/stripes", "stripes-diag.png", 160, 160, "/bg/normal/background", "/bg-alt/normal/background") +BG_PAT("elm/bg/base/stripes_big", "stripes-diag-big.png", 160, 160, "/bg/normal/background", "/bg-alt/normal/background") -BG_PAT("elm/bg/base/stripes_dark", "stripes-diag.png", 160, 160, 32 32 32 255, 48 48 48 255) -BG_PAT("elm/bg/base/stripes_big_dark", "stripes-diag-big.png", 160, 160, 32 32 32 255, 48 48 48 255) +BG_PAT("elm/bg/base/stripes_dark", "stripes-diag.png", 160, 160, "/bg-dark/normal/background", "/bg-dark-alt/normal/background") +BG_PAT("elm/bg/base/stripes_big_dark", "stripes-diag-big.png", 160, 160, "/bg-dark/normal/background", "/bg-dark-alt/normal/background") -BG_PAT("elm/bg/base/stripes_light", "stripes-diag.png", 160, 160, 192 192 192 255, 208 208 208 255) -BG_PAT("elm/bg/base/stripes_big_light", "stripes-diag-big.png", 160, 160, 192 192 192 255, 208 208 208 255) +BG_PAT("elm/bg/base/stripes_light", "stripes-diag.png", 160, 160, "/bg-light/normal/background", "/bg-light-alt/normal/background") +BG_PAT("elm/bg/base/stripes_big_light", "stripes-diag-big.png", 160, 160, "/bg-light/normal/background", "/bg-light-alt/normal/background") -BG_PAT("elm/bg/base/checks", "checks.png", 160, 160, 64 64 64 255, 80 80 80 255) -BG_PAT("elm/bg/base/checks_big", "checks.png", 320, 320, 64 64 64 255, 80 80 80 255) -BG_PAT("elm/bg/base/checks_small", "checks.png", 80, 80, 64 64 64 255, 80 80 80 255) +BG_PAT("elm/bg/base/checks", "checks.png", 160, 160, "/bg/normal/background", "/bg-alt/normal/background") +BG_PAT("elm/bg/base/checks_big", "checks.png", 320, 320, "/bg/normal/background", "/bg-alt/normal/background") +BG_PAT("elm/bg/base/checks_small", "checks.png", 80, 80, "/bg/normal/background", "/bg-alt/normal/background") -BG_PAT("elm/bg/base/checks_dark", "checks.png", 160, 160, 32 32 32 255, 48 48 48 255) -BG_PAT("elm/bg/base/checks_big_dark", "checks.png", 320, 320, 32 32 32 255, 48 48 48 255) -BG_PAT("elm/bg/base/checks_small_dark", "checks.png", 80, 80, 32 32 32 255, 48 48 48 255) +BG_PAT("elm/bg/base/checks_dark", "checks.png", 160, 160, "/bg-dark/normal/background", "/bg-dark-alt/normal/background") +BG_PAT("elm/bg/base/checks_big_dark", "checks.png", 320, 320, "/bg-dark/normal/background", "/bg-dark-alt/normal/background") +BG_PAT("elm/bg/base/checks_small_dark", "checks.png", 80, 80, "/bg-dark/normal/background", "/bg-dark-alt/normal/background") -BG_PAT("elm/bg/base/checks_light", "checks.png", 160, 160, 192 192 192 255, 208 208 208 255) -BG_PAT("elm/bg/base/checks_big_light", "checks.png", 320, 320, 192 192 192 255, 208 208 208 255) -BG_PAT("elm/bg/base/checks_small_light", "checks.png", 80, 80, 192 192 192 255, 208 208 208 255) +BG_PAT("elm/bg/base/checks_light", "checks.png", 160, 160, "/bg-light/normal/background", "/bg-light-alt/normal/background") +BG_PAT("elm/bg/base/checks_big_light", "checks.png", 320, 320, "/bg-light/normal/background", "/bg-light-alt/normal/background") +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 @@ -128,7 +128,7 @@ group { name: _name; \ } \ part { name: "base"; type: RECT; \ description { state: "default" 0.0; \ - color: _colbg; \ + color_class: _colbg; \ } \ } \ part { name: "grad"; \ @@ -136,7 +136,7 @@ group { name: _name; \ image.normal: "grad_v.png"; \ fill.size.relative: 0.0 1.0; \ fill.size.offset: 256 0; \ - color: _colfg; \ + color_class: _colfg; \ } \ } \ part { name: "elm.swallow.rectangle"; type: SWALLOW; \ @@ -156,9 +156,9 @@ group { name: _name; \ } \ } -BG_GRADV("elm/bg/base/grad_vert", 80 80 80 255, 64 64 64 255) -BG_GRADV("elm/bg/base/grad_vert_focus_title_match", 64 64 64 255, 32 32 32 255) -BG_GRADV("elm/bg/base/grad_vert_dark", 48 48 48 255, 32 32 32 255) -BG_GRADV("elm/bg/base/grad_vert_light", 64 64 64 255, 192 192 192 255) +BG_GRADV("elm/bg/base/grad_vert", "/bg-alt/normal/background", "/bg/normal/background") +BG_GRADV("elm/bg/base/grad_vert_focus_title_match", "/bg/normal/background", "/bg/selected/titlebar") +BG_GRADV("elm/bg/base/grad_vert_dark", "/bg-light/normal/background", "/bg-dark-alt/normal/background") +BG_GRADV("elm/bg/base/grad_vert_light", "/bg/normal/background", "/bg-light-alt/normal/background") #undef BG_GRADV