From d7e64acc216e29c1e610c63bded09a5b29d73a53 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 21 Jun 2021 23:07:52 +0100 Subject: [PATCH] elm theme - more cc work --- data/elementary/themes/colorclasses.edc | 43 +++++ data/elementary/themes/edc/fileman.edc | 217 ++++++++++++------------ 2 files changed, 154 insertions(+), 106 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index f53e159e01..e212dd7194 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -48,6 +48,49 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/access"; color: 255 153 51 64; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/fileman/icon/over"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/fileman/mount/off"; + color: 255 255 255 128; } + color_class { name: "/fg/normal/fileman/mount/on"; + color: 255 153 51 255; } + color_class { name: "/fg/normal/fileman/operation"; + color: 255 255 255 255; } + color_class { name: "/bg/normal/fileman/desk/base"; + color: 0 0 0 128; } + color_class { name: "/bg/selected/fileman/desk/base"; + color: 0 0 0 200; } + color_class { name: "/bg/normal/fileman/overlay/busy/base"; + color: 0 0 0 200; } + color_class { name: "/fg/normal/fileman/overlay/busy/text"; + color: 255 255 255 255; } + color_class { name: "/bg/normal/fileman/overlay/typebuf/base"; + color: 0 0 0 200; } + color_class { name: "/fg/normal/fileman/overlay/typebuf/text"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/fileman/drop/arrows"; + color: 255 255 255 255; } + color_class { name: "/bg/normal/fileman/drop/base"; + color: 51 153 255 25; } + color_class { name: "/bg/normal/fileman/drop/outline"; + color: 51 153 255 255; } + color_class { name: "/bg/normal/fileman/selection/base"; + color: 51 153 255 25; } + color_class { name: "/bg/normal/fileman/selection/outline"; + color: 51 153 255 255; } + color_class { name: "/bg/normal/fileman/overlay/progress/base"; + color: 0 0 0 200; } + color_class { name: "/fg/normal/fileman/overlay/progress/bar"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/fileman/overlay/progress/text"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/fileman/overlay/progress/led"; + color: 255 153 51 255; } + color_class { name: "/fg/normal/fileman/overlay/progress/close"; + color: 255 255 255 255; } + color_class { name: "/fg/pressed/fileman/overlay/progress/close"; + color: 200 200 200 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/titlebar"; color: 64 64 64 255; } diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc index 0061302c1c..26b3332d41 100644 --- a/data/elementary/themes/edc/fileman.edc +++ b/data/elementary/themes/edc/fileman.edc @@ -13,12 +13,12 @@ group { name: "e/fileman/default/list/variable"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/list/item"; } } part { name: "sel_base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/list/item"; visible: 0; } description { state: "selected" 0.0; @@ -34,7 +34,7 @@ group { name: "e/fileman/default/list/variable"; rel1.to_x: "icon0"; rel2.offset: -5 -5; rel2.relative: 1.0 1.0; - color: 160 160 160 255; + color_class: "/fg/normal/list/item"; text { font: FN; size: 10; min: 0 1; align: 0.0 0.5; @@ -45,19 +45,20 @@ group { name: "e/fileman/default/list/variable"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/list/item"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 80 80 80 255; + color_class: "/fg/disabled/list/item"; } } ////////////////////////// part { name: "icon0"; type: SPACER; scale: 1; description { state: "default" 0.0; + min: 20 20; + max: 20 20; align: 0.0 0.5; - aspect: 1.0 1.0; aspect_preference: VERTICAL; rel1.offset: 4 4; rel2.relative: 0.0 1.0; rel2.offset: 4 -5; @@ -79,7 +80,7 @@ group { name: "e/fileman/default/list/variable"; part { name: "icon_base"; type: RECT; mouse_events: 0; clip_to: "icon"; description { state: "default" 0.0; - color: 48 48 48 255; + color_class: "/bg-dark/normal/fileman/icon/base"; rel.to: "e.swallow.icon"; visible: 0; } @@ -98,7 +99,7 @@ group { name: "e/fileman/default/list/variable"; part { name: "icon_over"; type: RECT; mouse_events: 0; clip_to: "icon"; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/fg/normal/fileman/icon/over"; rel.to: "e.swallow.icon"; visible: 0; } @@ -108,7 +109,7 @@ group { name: "e/fileman/default/list/variable"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -119,18 +120,17 @@ group { name: "e/fileman/default/list/variable"; FIXED_SIZE(7, 7) rel1.relative: 1.0 1.0; rel.to: "e.swallow.icon"; - color: 255 255 255 128; + color_class: "/fg/normal/fileman/mount/off"; visible: 0; fixed: 1 1; } description { state: "unmounted" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; visible: 1; } description { state: "mounted" 0.0; inherit: "default" 0.0; - color: 255 153 51 255; + color_class: "/fg/normal/fileman/mount/on"; visible: 1; } } @@ -145,21 +145,24 @@ group { name: "e/fileman/default/list/variable"; image.normal: "sym_icon_op_ask.png"; FIXED_SIZE(15, 15) visible: 0; - color: 255 255 255 255; + color_class: "/fg/normal/fileman/operation/ask"; offscale; } description { state: "ask" 0.0; inherit: "default" 0.0; + color_class: "/fg/normal/fileman/operation/ask"; image.normal: "sym_icon_op_ask.png"; visible: 1; } description { state: "copy" 0.0; inherit: "default" 0.0; + color_class: "/fg/normal/fileman/operation/copy"; image.normal: "sym_icon_op_copy.png"; visible: 1; } description { state: "move" 0.0; inherit: "default" 0.0; + color_class: "/fg/normal/fileman/operation/move"; image.normal: "sym_icon_op_move.png"; visible: 1; } @@ -168,7 +171,7 @@ group { name: "e/fileman/default/list/variable"; part { name: "event"; type: RECT; ignore_flags: ON_HOLD; 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; @@ -179,7 +182,7 @@ group { name: "e/fileman/default/list/variable"; ignore_flags: ON_HOLD; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.to_x: "e.text.label"; rel1.offset: -5 0; offscale; @@ -274,7 +277,7 @@ group { name: "e/fileman/default/list_odd/variable"; parts { part { name: "base"; description { state: "default" 0.0; - color: 56 56 56 255; + color_class: "/bg-alt/normal/list/item"; } } } @@ -301,10 +304,10 @@ group { name: "e/fileman/default/icon/fixed"; images.image: "sym_icon_op_move.png" COMP; styles { style { name: "fileman_icon_name"; - base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#a0a0a0ff wrap=mixed ellipsis=1.0"; + base: "font="FN" font_size=10 text_class=fileman_icon align=center color_class=/fg/normal/grid/item/fileman wrap=mixed ellipsis=1.0"; } style { name: "fileman_icon_name_selected"; - base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#ffffffff wrap=mixed ellipsis=1.0"; + base: "font="FN" font_size=10 text_class=fileman_icon align=center color_class=/fg/selected/grid/item/fileman wrap=mixed ellipsis=1.0"; } } script { @@ -313,7 +316,7 @@ group { name: "e/fileman/default/icon/fixed"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/bg/selected/grid/item"; visible: 0; } description { state: "selected" 0.0; @@ -392,7 +395,7 @@ group { name: "e/fileman/default/icon/fixed"; part { name: "icon_base"; type: RECT; mouse_events: 0; clip_to: "icon"; description { state: "default" 0.0; - color: 48 48 48 255; + color_class: "/bg-dark/normal/fileman/icon/base"; rel.to: "e.swallow.icon"; visible: 0; } @@ -410,7 +413,7 @@ group { name: "e/fileman/default/icon/fixed"; part { name: "icon_over"; type: RECT; mouse_events: 0; clip_to: "icon"; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/fg/normal/fileman/icon/over"; rel.to: "e.swallow.icon"; visible: 0; } @@ -420,7 +423,7 @@ group { name: "e/fileman/default/icon/fixed"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -431,18 +434,17 @@ group { name: "e/fileman/default/icon/fixed"; FIXED_SIZE(7, 7) rel1.relative: 1.0 1.0; rel.to: "e.swallow.icon"; - color: 255 255 255 128; + color_class: "/fg/normal/fileman/mount/off"; visible: 0; fixed: 1 1; } description { state: "unmounted" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; visible: 1; } description { state: "mounted" 0.0; inherit: "default" 0.0; - color: 255 153 51 255; + color_class: "/fg/normal/fileman/mount/on"; visible: 1; } } @@ -457,21 +459,24 @@ group { name: "e/fileman/default/icon/fixed"; image.normal: "sym_icon_op_ask.png"; FIXED_SIZE(15, 15) visible: 0; - color: 255 255 255 255; + color_class: "/fg/normal/fileman/operation/ask"; offscale; } description { state: "ask" 0.0; inherit: "default" 0.0; + color_class: "/fg/normal/fileman/operation/ask"; image.normal: "sym_icon_op_ask.png"; visible: 1; } description { state: "copy" 0.0; inherit: "default" 0.0; + color_class: "/fg/normal/fileman/operation/copy"; image.normal: "sym_icon_op_copy.png"; visible: 1; } description { state: "move" 0.0; inherit: "default" 0.0; + color_class: "/fg/normal/fileman/operation/move"; image.normal: "sym_icon_op_move.png"; visible: 1; } @@ -480,7 +485,7 @@ group { name: "e/fileman/default/icon/fixed"; part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel.to: "icon0"; } } @@ -488,7 +493,7 @@ group { name: "e/fileman/default/icon/fixed"; ignore_flags: ON_HOLD; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel.to: "e.text.label"; rel1.offset: -5 -5; rel2.offset: 4 4; @@ -603,13 +608,13 @@ group { name: "e/fileman/desktop/icon/fixed"; rel.to: "labelmin"; rel1.offset: -3 -3; rel2.offset: 2 2; - color: 0 0 0 128; + color_class: "/bg/normal/fileman/desk/base"; fixed: 1 1; offscale; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 0 0 0 192; + color_class: "/bg/selected/fileman/desk/base"; } } part { name: "labelmin"; type: TEXTBLOCK; mouse_events: 0; @@ -647,7 +652,7 @@ group { name: "e/fileman/default/scrollframe"; parts { part { name: "bg"; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/fileman/scroller"; } } part { name: "e.swallow.bg"; type: SWALLOW; insert_before: "e.swallow.content"; @@ -686,7 +691,7 @@ group { name: "e/fileman/default/window/main"; parts { part { name: "base"; type: RECT; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/fileman/base/win"; } } part { name: "e.swallow.bg"; type: SWALLOW; @@ -800,19 +805,20 @@ group { name: "e/fileman/toolbar/default/base"; parts { part { name: "base"; type: RECT; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/fileman/base/win/toolbar"; } } part { name: "e.swallow.event"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; + rel.to: "e.swallow.content"; } } part { name: "e.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; rel1.offset: 4 4; rel2.offset: -5 -5; + offscale; } } } @@ -836,7 +842,7 @@ group { name: "e/fileman/popup/default"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/fileman/base/popup"; } } part { name: "e.swallow.content"; type: SWALLOW; @@ -857,7 +863,7 @@ group { name: "e/fileman/popup/default"; rel2.relative: 1.0 0.0; rel2.offset: -5 4; align: 0.5 0.0; - color: 160 160 160 255; + color_class: "/fg/normal/fileman/text/popup"; text { font: FNBD; size: 10; text_class: "fileman_popup_title"; align: 0.5 0.0; @@ -894,21 +900,21 @@ group { name: "e/fileman/default/overlay"; part { name: "typebuf_clip"; type: RECT; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // mo cc } } part { name: "busy_clip"; type: RECT; description { state: "default" 0.0; visible: 0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } part { name: "busy_base"; type: RECT; mouse_events: 0; @@ -921,7 +927,7 @@ group { name: "e/fileman/default/overlay"; rel2.offset: 7 7; rel2.to_x: "e.text.busy_label"; rel2.to_y: "busy_area"; - color: 0 0 0 192; + color_class: "/bg/normal/fileman/overlay/busy/base"; offscale; } } @@ -934,7 +940,7 @@ group { name: "e/fileman/default/overlay"; rel2.offset: (16+8+40+8) (-1-16-8); rel2.relative: 0.0 1.0; align: 0.0 0.5; - color: 255 255 255 255; + color_class: "/fg/normal/fileman/overlay/busy/text"; offscale; text { font: FNBD; size: 10; min: 1 1; @@ -965,7 +971,7 @@ group { name: "e/fileman/default/overlay"; rel.to: "e.text.typebuf_label"; rel1.offset: -8 -8; rel2.offset: 7 7; - color: 0 0 0 192; + color_class: "/bg/normal/fileman/overlay/typebuf/base"; offscale; } } @@ -977,7 +983,7 @@ group { name: "e/fileman/default/overlay"; rel1.offset: -8 -8; rel2.relative: 0.5 0.5; rel2.offset: 7 7; - color: 255 255 255 255; + color_class: "/fg/normal/fileman/overlay/typebuf/text"; offscale; text { font: FNBD; size: 10; min: 1 1; @@ -1017,6 +1023,21 @@ group { name: "e/fileman/default/list/drop_in"; images.image: "outline.png" COMP; images.image: "diagonal_stripes.png" COMP; parts { + part { name: "pat"; mouse_events: 0; + description { state: "default" 0.0; + rel.to: "base"; + rel1.offset: 1 1; + rel2.offset: -2 -2; + image.normal: "diagonal_stripes.png"; + color_class: "/bg/normal/fileman/drop/base"; + TILED_PATTERN(240, 240) + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "base"; mouse_events: 0; description { state: "default" 0.0; image.normal: "outline.png"; @@ -1024,22 +1045,7 @@ group { name: "e/fileman/default/list/drop_in"; image.middle: 0; fill.smooth: 0; visible: 0; - color: 51 153 255 255; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "pat"; mouse_events: 0; - description { state: "default" 0.0; - rel.to: "base"; - rel1.offset: 1 1; - rel2.offset: -2 -2; - image.normal: "diagonal_stripes.png"; - color: 51 153 255 25; - TILED_PATTERN(240, 240) - visible: 0; + color_class: "/bg/normal/fileman/drop/outline"; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -1055,7 +1061,7 @@ group { name: "e/fileman/default/list/drop_in"; rel2.relative: 1.0 0.0; image.normal: "i-arrow-d"; FIXED_SIZE(15, 15) - color: 51 153 255 255; + color_class: "/fg/normal/fileman/drop/arrows"; visible: 0; } description { state: "active" 0.0; @@ -1066,7 +1072,7 @@ group { name: "e/fileman/default/list/drop_in"; inherit: "default" 0.0; align: 0.5 1.0; FIXED_SIZE(1, 1) - color: 51 153 255 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -1079,7 +1085,7 @@ group { name: "e/fileman/default/list/drop_in"; rel2.relative: 1.0 2.0; image.normal: "i-arrow-u"; FIXED_SIZE(15, 15) - color: 51 153 255 255; + color_class: "/fg/normal/fileman/drop/arrows"; visible: 0; } description { state: "active" 0.0; @@ -1090,7 +1096,7 @@ group { name: "e/fileman/default/list/drop_in"; inherit: "default" 0.0; align: 0.5 0.0; FIXED_SIZE(1, 1) - color: 51 153 255 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -1135,7 +1141,7 @@ group { name: "e/fileman/default/list/drop_between"; description { state: "default" 0.0; rel1.offset: 0 -1; rel2.offset: -1 -1; - color: 51 153 255 255; + color_class: "/bg/normal/fileman/drop/outline"; visible: 0; } description { state: "active" 0.0; @@ -1152,7 +1158,7 @@ group { name: "e/fileman/default/list/drop_between"; rel2.relative: 1.0 0.0; image.normal: "i-arrow-d"; FIXED_SIZE(15, 15) - color: 51 153 255 255; + color_class: "/bg/normal/fileman/drop/arrows"; visible: 0; offscale; } @@ -1164,7 +1170,7 @@ group { name: "e/fileman/default/list/drop_between"; inherit: "default" 0.0; align: 0.5 1.0; FIXED_SIZE(1, 1) - color: 51 153 255 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -1177,7 +1183,7 @@ group { name: "e/fileman/default/list/drop_between"; rel2.offset: -1 39; image.normal: "i-arrow-u"; FIXED_SIZE(15, 15) - color: 51 153 255 255; + color_class: "/bg/normal/fileman/drop/arrows"; visible: 0; offscale; } @@ -1189,7 +1195,7 @@ group { name: "e/fileman/default/list/drop_between"; inherit: "default" 0.0; align: 0.5 0.0; FIXED_SIZE(1, 1) - color: 51 153 255 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -1229,25 +1235,25 @@ group { name: "e/fileman/default/rubberband"; images.image: "outline.png" COMP; images.image: "diagonal_stripes.png" COMP; parts { - part { name: "base"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "outline.png"; - image.border: 4 4 4 4; - image.middle: 0; - fill.smooth: 0; - color: 51 153 255 255; - } - } part { name: "pat"; mouse_events: 0; description { state: "default" 0.0; rel.to: "base"; rel1.offset: 1 1; rel2.offset: -2 -2; image.normal: "diagonal_stripes.png"; - color: 51 153 255 25; + color_class: "/bg/normal/fileman/selection/base"; TILED_PATTERN(240, 240) } } + part { name: "base"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "outline.png"; + image.border: 4 4 4 4; + image.middle: 0; + fill.smooth: 0; + color_class: "/bg/normal/fileman/selection/outline"; + } + } } } @@ -1269,7 +1275,7 @@ group { name: "e/fileman/default/progress"; description { state: "default" 0.0; rel1.offset: 2 2; rel2.offset: -3 -3; - color: 0 0 0 192; + color_class: "/bg/normal/fileman/overlay/progress/base"; fixed: 1 1; offscale; } @@ -1282,7 +1288,7 @@ group { name: "e/fileman/default/progress"; rel1.offset: 0 -5; rel2.to: "e.gauge.bar"; rel2.relative: 1.0 1.0; - color: 51 153 255 255; + color_class: "/fg/normal/fileman/overlay/progress/bar"; min: 0 5; align: 0.0 1.0; fixed: 1 1; @@ -1307,7 +1313,7 @@ group { name: "e/fileman/default/progress"; rel2.relative: 0.0 1.0; rel2.to_x: "close_event"; rel2.offset: -5 -9; - color: 255 255 255 255; + color_class: "/fg/normal/fileman/overlay/progress/text"; min: 240 1; text { font: FN; size: 10; min: 0 1; @@ -1333,7 +1339,7 @@ group { name: "e/fileman/default/progress"; part { name: "attention_event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "active" 0.0; @@ -1344,12 +1350,12 @@ group { name: "e/fileman/default/progress"; part { name: "led_clip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } } @@ -1360,11 +1366,11 @@ group { name: "e/fileman/default/progress"; image.normal: "speaker_vol.png"; FIXED_SIZE(12, 12) fixed: 1 1; - color: 255 153 51 255; + color_class: "/fg/normal/fileman/overlay/progress/led"; } description { state: "blink" 0.0; inherit: "default" 0.0; - color: 255 153 51 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -1376,11 +1382,11 @@ group { name: "e/fileman/default/progress"; rel.to: "close_event"; FIXED_SIZE(15, 15) fixed: 1 1; - color: 255 255 255 255; + color_class: "/fg/normal/fileman/overlay/progress/close"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 200 200 200 255; + color_class: "/fg/pressed/fileman/overlay/progress/close"; } } part { name: "close_event"; type: RECT; @@ -1507,11 +1513,11 @@ group { name: "e/modules/efm_navigation/main"; min: 15 15; \ max: 15 15; \ fixed: 1 1; \ - color: 160 160 160 255; \ + color_class: "/fg/normal/fileman/nav/button"; \ } \ description { state: "active" 0.0; \ inherit: "default" 0; \ - color: 255 255 255 255; \ + color_class: "/fg/pressed/fileman/nav/button"; \ } \ } \ program { signal: "mouse,down,1*"; source: _REL; \ @@ -1596,7 +1602,7 @@ group { name: "e/modules/efm_navigation/pathbar_button"; description { state: "default" 0.0; rel1.offset: 6 6; rel2.offset: -7 -7; - color: 160 160 160 255; + color_class: "/fg/normal/fileman/nav/path/text"; offscale; text { font: FN; size: 10; min: 1 1; @@ -1607,7 +1613,7 @@ group { name: "e/modules/efm_navigation/pathbar_button"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/fileman/nav/path/text"; } } part { name: "bar"; type: RECT; mouse_events: 0; @@ -1616,7 +1622,7 @@ group { name: "e/modules/efm_navigation/pathbar_button"; align: 0.5 1.0; min: 1 5; rel1.relative: 0.0 1.0; - color: 51 153 255 255; + color_class: "/bg/selected/fileman/nav/path/bar"; visible: 0; } description { state: "selected" 0.0; @@ -1626,7 +1632,7 @@ group { name: "e/modules/efm_navigation/pathbar_button"; } part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -1653,8 +1659,9 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe"; part { name: "clipper"; type: RECT; description { state: "default" 0.0; rel.to: "e.swallow.content"; - rel1.offset: -0 -50; - rel2.offset: -1 49; + rel1.offset: 0 -50; + rel2.offset: -1 49; + offscale; } } part { name: "e.swallow.content"; type: SWALLOW; @@ -1690,11 +1697,11 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe"; rel.to: "arrow1_ev"; image.normal: "i-arrow-l"; FIXED_SIZE(15, 15) - color: 160 160 160 255; + color_class: "/bg/normal/fileman/nav/scroller/arrow/left"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/pressed/fileman/nav/scroller/arrow/left"; } } part { name: "arrow1_ev"; type: RECT; @@ -1702,7 +1709,7 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe"; clip_to: "arrow_clipper"; description { state: "default" 0.0; align: 0.0 0.5; - color: 0 0 0 0; + color: 0 0 0 0; // no cc FIXED_SIZE(23, 23) } } @@ -1713,11 +1720,11 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe"; rel.to: "arrow2_ev"; image.normal: "i-arrow-r"; FIXED_SIZE(15, 15) - color: 160 160 160 255; + color_class: "/bg/normal/fileman/nav/scroller/arrow/right"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/pressed/fileman/nav/scroller/arrow/right"; } } part { name: "arrow2_ev"; type: RECT; @@ -1725,7 +1732,7 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe"; clip_to: "arrow_clipper"; description { state: "default" 0.0; align: 1.0 0.5; - color: 0 0 0 0; + color: 0 0 0 0; // no cc FIXED_SIZE(23, 23) } } @@ -1734,12 +1741,10 @@ group { name: "e/modules/efm_navigation/pathbar_scrollframe"; program { signal: "e,action,show,hbar"; source: "e"; action: STATE_SET "default" 0.0; target: "arrow_clipper"; - target: "arrow_clipper"; } program { signal: "e,action,hide,hbar"; source: "e"; action: STATE_SET "hidden" 0.0; target: "arrow_clipper"; - target: "arrow_clipper"; } program { signal: "mouse,down,1*"; source: "arrow1_ev"; action: SIGNAL_EMIT "e,action,prev" "e";