From 2efabb074ba5cfb26e15aae335427f299d385688 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 29 Jul 2021 21:58:49 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/edc/elm/entry.edc | 8 ++++---- data/elementary/themes/edc/elm/genlist.edc | 8 ++++---- data/elementary/themes/edc/elm/list.edc | 4 ++-- data/elementary/themes/edc/elm/photocam.edc | 6 +++--- data/elementary/themes/edc/elm/pointer.edc | 19 ++++++++++--------- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc index 47ca85c03b..38840e3cb2 100644 --- a/data/elementary/themes/edc/elm/entry.edc +++ b/data/elementary/themes/edc/elm/entry.edc @@ -330,7 +330,7 @@ group { name: "elm/scroller/entry_single/default"; scale: 1; clip_to: "sh_clip"; description { state: "default" 0.0; - color: 255 255 255 255; // no cc + color: 255 255 255 0; // no cc color_class: "/shadow/normal/entry"; rel.to: "bg"; rel1.offset: -1 0; @@ -342,7 +342,7 @@ group { name: "elm/scroller/entry_single/default"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 255; // no cc rel1.offset: -16 0; rel2.offset: 15 -1; visible: 1; @@ -1044,7 +1044,7 @@ group { name: "elm/entry/handler/start/default"; scale: 1; description { state: "default" 0.0; rel.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc min: 32 32; visible: 0; } @@ -1089,7 +1089,7 @@ group { name: "elm/entry/handler/end/default"; scale: 1; description { state: "default" 0.0; rel.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; //no cc min: 32 32; visible: 0; } diff --git a/data/elementary/themes/edc/elm/genlist.edc b/data/elementary/themes/edc/elm/genlist.edc index 0763ab50f0..280695c7d5 100644 --- a/data/elementary/themes/edc/elm/genlist.edc +++ b/data/elementary/themes/edc/elm/genlist.edc @@ -1451,7 +1451,7 @@ group { "elm/genlist/tree/tree_effect/default"; nomouse; } desc { "map_transition"; inherit: "default"; - color: 0 0 0 255; // fixed color + color: 0 0 0 255; // no cc - fixed color map.rotation.x: -90; link { base: "elm,action,flip_item"; after: "rot2"; @@ -2448,7 +2448,7 @@ group { "elm/genlist/item/media/default"; nomouse; } \ rect { "base"; \ desc { "default"; \ - color: 56 56 56 255; \ + color_class: "/bg-alt/normal/list/item"; \ } \ } \ } \ @@ -2999,7 +2999,7 @@ group { "elm/genlist/item_odd_compress/media-preview/default"; } \ rect { "base"; \ desc { "default"; \ - color: 56 56 56 255; \ + color_class: "/bg-alt/normal/list/item"; \ } \ } \ } \ @@ -3110,7 +3110,7 @@ group { "elm/genlist/item/mode/default"; nomouse; desc { "default"; rel1.to: "base"; rel2.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } desc { "repeat_events"; inherit: "default"; diff --git a/data/elementary/themes/edc/elm/list.edc b/data/elementary/themes/edc/elm/list.edc index 170ed0a831..6a77983248 100644 --- a/data/elementary/themes/edc/elm/list.edc +++ b/data/elementary/themes/edc/elm/list.edc @@ -61,7 +61,7 @@ group { name: "elm/list/item/default"; parts { part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -223,7 +223,7 @@ group { name: "elm/list/h_item/default"; parts { part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/elm/photocam.edc b/data/elementary/themes/edc/elm/photocam.edc index 9923197603..bfd7b340a6 100644 --- a/data/elementary/themes/edc/elm/photocam.edc +++ b/data/elementary/themes/edc/elm/photocam.edc @@ -8,10 +8,10 @@ group { name: "elm/photocam/base/default"; part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.offset: 4 4; - rel2.offset: 4 4; - align: 0.0 0.0; + rel2.offset: -5 -5; + align: 1.0 1.0; min: 40 40; max: 40 40; offscale; diff --git a/data/elementary/themes/edc/elm/pointer.edc b/data/elementary/themes/edc/elm/pointer.edc index 350786e190..afa13b36b6 100644 --- a/data/elementary/themes/edc/elm/pointer.edc +++ b/data/elementary/themes/edc/elm/pointer.edc @@ -16,9 +16,8 @@ group { name: "elm/pointer/base/default"; /* both axes control aspect - thus it * will be WITHIN the bounds the axes * of thre part describe */ - image { - normal: "pointer.png"; - } + image.normal: "pointer.png"; + color_class: "/fg/normal/pointer/base"; } } part { name: "elm.swallow.hotspot"; type: SWALLOW; @@ -269,7 +268,7 @@ group { name: "elm/pointer/base/rotate"; part { name: "box"; type: RECT; insert_after: "base"; description { state: "default" 0.0; - color: 51 153 255 192; + color_class: "/fg/normal/pointer/manipulator"; rel1.relative: 0.3 0.3; rel2.relative: 0.8 0.8; map.on: 1; @@ -311,12 +310,14 @@ group { name: "elm/pointer/base/rotate"; group { name: "elm/pointer/base/plus"; inherit: "elm/pointer/base/default"; - images.image: "therm_base.png" COMP; + images.image: "pointer_plus.png" COMP; parts { part { name: "add"; insert_after: "base"; + scale: 1; description { state: "default" 0.0; - image.normal: "therm_base.png"; + image.normal: "pointer_plus.png"; + color_class: "/fg/normal/pointer/manipulator"; aspect: 1.0 1.0; aspect_preference: BOTH; rel1.relative: 0.3 0.3; rel2.relative: 1.0 1.0; @@ -325,7 +326,7 @@ group { name: "elm/pointer/base/plus"; } description { state: "faded" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 128; // no cc } } } @@ -352,6 +353,7 @@ group { name: "elm/pointer/base/xterm"; part { name: "base"; scale: 1; description { state: "default" 0.0; + color_class: "/fg/normal/pointer/base"; image.normal: "pointer_entry.png"; aspect: (44/88) (44/88); aspect_preference: VERTICAL; FIXED_SIZE(32, 32) @@ -361,9 +363,8 @@ group { name: "elm/pointer/base/xterm"; description { state: "default" 0.0; fixed: 1 1; visible: 0; - rel1.to: "base"; + rel.to: "base"; rel1.relative: 0.5 0.5; - rel2.to: "base"; rel2.relative: 0.5 0.5; rel2.offset: 0 0; }