diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 701049c236..5d416cad3a 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -487,6 +487,42 @@ color_classes { color: 51 153 255 255; } color_class { name: "/fg/normal/gadgets/mixer/volume/mute"; color: 255 153 51 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/gadgets/music_control/base"; + color: 0 0 0 128; } + color_class { name: "/bg/pressed/gadgets/music_control/base"; + color: 0 0 0 220; } + color_class { name: "/fg/pressed/gadgets/music_control/text"; + color: 255 255 255 255; } + color_class { name: "/fg/pressed/gadgets/music_control/button"; + color: 255 255 255 255; } + color_class { name: "/fg/pressed/gadgets/music_control/progress"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/music_control/text"; + color: 220 220 220 255; } + color_class { name: "/fg/normal/gadgets/music_control/text/title"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/gadgets/music_control/text/tag"; + color: 51 153 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/notification"; + color: 0 0 0 200; } + color_class { name: "/fg/normal/notification/button/close"; + color: 255 255 255 255; } + color_class { name: "/fg/pressed/notification/button/close"; + color: 200 200 200 255; } + color_class { name: "/fg/normal/notification/logo"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/notification/text/title"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/notification/text"; + color: 160 160 160 255; } + color_class { name: "/fg/normal/notification/text/subject"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/notification/text/bold"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/notification/text/underline"; + color: 51 153 255 255; } diff --git a/data/elementary/themes/edc/dialog.edc b/data/elementary/themes/edc/dialog.edc index f8abde0c17..be44e7c73b 100644 --- a/data/elementary/themes/edc/dialog.edc +++ b/data/elementary/themes/edc/dialog.edc @@ -105,7 +105,7 @@ group { name: "e/widgets/dialog/main"; group { name: "e/widgets/dialog/text"; styles { style { name: "dialog_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=center color_class=/fg/normal/text wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=center color=cc:/fg/normal/text wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=tb_light"; } diff --git a/data/elementary/themes/edc/edgebindings.edc b/data/elementary/themes/edc/edgebindings.edc index d71299030c..a668015049 100644 --- a/data/elementary/themes/edc/edgebindings.edc +++ b/data/elementary/themes/edc/edgebindings.edc @@ -5,7 +5,7 @@ group { name: "e/modules/conf_edgebindings/selection"; images.image: "mini_blue_glow_arrow_3.png" COMP; styles { style { name: "edge_binding_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=center color_class=/fg/normal/text wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=center color=cc:/fg/normal/text wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=tb_light"; } diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc index e6d5dcc22e..47ca85c03b 100644 --- a/data/elementary/themes/edc/elm/entry.edc +++ b/data/elementary/themes/edc/elm/entry.edc @@ -531,23 +531,23 @@ group { name: "elm/entry/anchor/default"; group { name: "elm/entry/base/default"; styles { style { name: "entry_style"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry/text wrap=word text_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text wrap=word text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_nowrap_style"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry/text text_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text wrap=word text_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text wrap=word text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_nowrap_disabled_style"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text text_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text/guide wrap=word text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text/guide wrap=word text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -651,15 +651,15 @@ group { name: "elm/entry/base-mixedwrap/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_style_mixedwrap"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry/text wrap=mixed text_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text wrap=mixed text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style_mixedwrap"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text wrap=mixed text_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text wrap=mixed text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style_mixedwrap"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text/guide wrap=mixed text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text/guide wrap=mixed text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -692,15 +692,15 @@ group { name: "elm/entry/base-charwrap/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_style_charwrap"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry/text wrap=char text_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text wrap=char text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style_charwrap"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text wrap=char text_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text wrap=char text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style_charwrap"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text/guide wrap=char text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text/guide wrap=char text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -766,15 +766,15 @@ group { name: "elm/entry/base-single/default"; alias: "elm/entry/base-single/combobox_vertical/entry"; styles { style { name: "entry_single_style"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry/text wrap=none text_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text wrap=none text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_single_disabled_style"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text wrap=none text_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text wrap=none text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_single_guide_style"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry/text/guide wrap=none text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text/guide wrap=none text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -814,7 +814,7 @@ group { name: "elm/entry/base-single/spinner/default"; inherit: "elm/entry/base-single/default"; styles { style { name: "entry_single_spinner_style"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry/text align=center wrap=none text_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text align=center wrap=none text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } } diff --git a/data/elementary/themes/edc/entry.edc b/data/elementary/themes/edc/entry.edc index b0069fe258..15cb688798 100644 --- a/data/elementary/themes/edc/entry.edc +++ b/data/elementary/themes/edc/entry.edc @@ -25,10 +25,10 @@ group { name: "e/widgets/entry/scrollframe"; group { name: "e/widgets/entry/text"; styles { style { name: "entry_textblock_style"; - base: "font="FN" font_size=10 color_class=/fg/normal/entry text_class=entry left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/normal/entry text_class=entry left_margin=2 right_margin=2"; } style { name: "entry_textblock_disabled_style"; - base: "font="FN" font_size=10 color_class=/fg/disabled/entry text_class=entry left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=cc:/fg/disabled/entry text_class=entry left_margin=2 right_margin=2"; } } parts { diff --git a/data/elementary/themes/edc/evrything.edc b/data/elementary/themes/edc/evrything.edc index a9eeee0ac5..dd7e065303 100644 --- a/data/elementary/themes/edc/evrything.edc +++ b/data/elementary/themes/edc/evrything.edc @@ -1428,12 +1428,12 @@ group { name: "e/modules/everything/thumbview/item/list"; group { name: "e/modules/everything/textblock"; styles { style { name: "everything_textblock_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=left color_class=/fg/normal/text wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=left color=cc:/fg/normal/text wrap=word"; tag: "br" "\n"; tag: "b" "+ font="FNBD""; tag: "hilight" "+ font="FNBD" text_class=tb_light"; - tag: "urgent" "+ font="FNBD" color_class=/fg/normal/text-urgent"; - tag: "title" "+ font="FNBD" color_class=/fg/normal/text-heading font_size=16 underline=on underline_color=#fff"; + tag: "urgent" "+ font="FNBD" color=cc:/fg/normal/text-urgent"; + tag: "title" "+ font="FNBD" color=cc:/fg/normal/text-heading font_size=16 underline=on underline_color=#fff"; } } parts { diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc index 3a8118a374..aa401f5507 100644 --- a/data/elementary/themes/edc/fileman.edc +++ b/data/elementary/themes/edc/fileman.edc @@ -290,10 +290,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_class=/fg/normal/grid/item/fileman wrap=mixed ellipsis=1.0"; + base: "font="FN" font_size=10 text_class=fileman_icon align=center color=cc:/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_class=/fg/selected/grid/item/fileman wrap=mixed ellipsis=1.0"; + base: "font="FN" font_size=10 text_class=fileman_icon align=center color=cc:/fg/selected/grid/item/fileman wrap=mixed ellipsis=1.0"; } } script { diff --git a/data/elementary/themes/edc/music_control.edc b/data/elementary/themes/edc/music_control.edc index 8f782dea4c..cd51dad85e 100644 --- a/data/elementary/themes/edc/music_control.edc +++ b/data/elementary/themes/edc/music_control.edc @@ -42,9 +42,9 @@ group { name: "e/modules/music-control/popup"; min: 160 160; styles { style { name: "music_control_metadata_style"; - base: "font="FN" font_size=10 align=left text_class=tb_plain color=#eee"; - tag: "title" "+ font_size=10 font="FNBD" text_class=tb_big color=#fff"; - tag: "tag" "+ font_size=8 color=#33399ff"; + base: "font="FN" font_size=10 align=left text_class=tb_plain color=cc:/fg/normal/gadgets/music_control/text"; + tag: "title" "+ font_size=10 font="FNBD" text_class=tb_big color=cc:/fg/normal/gadgets/music_control/text/title"; + tag: "tag" "+ font_size=8 color_class=/fg/normal/gadgets/music_control/text/tag"; tag: "br" "\n"; } } @@ -113,7 +113,7 @@ group { name: "e/modules/music-control/popup"; rel1.relative: 0.25 0.25; rel2.relative: 0.75 0.75; image.normal: "efm_drive_cd_icon"; - color: 255 255 255 128; + color: 255 255 255 128; // no cc } } part { name: "e.cover_swallow"; type: SWALLOW; @@ -127,7 +127,7 @@ group { name: "e/modules/music-control/popup"; part { name: "player_name_back"; type: RECT; scale: 1; description { state: "default" 0; - color: 0 0 0 128; + color_class: "/bg/normal/gadgets/music_control/base"; rel1.offset: -4 -4; rel2.offset: 3 3; rel2.to_y: "player_name"; @@ -137,7 +137,7 @@ group { name: "e/modules/music-control/popup"; part { name: "player_mid"; scale: 1; description { state: "default" 0; - color: 0 0 0 128; + color_class: "/bg/normal/gadgets/music_control/base"; rel1.to: "player_name_back"; rel1.relative: 0.0 1.0; rel2.to: "btn_back"; @@ -145,11 +145,25 @@ group { name: "e/modules/music-control/popup"; image.normal: "grad-v-bi.png"; } } + part { name: "btn_back"; type: RECT; + scale: 1; + description { state: "default" 0; + color_class: "/bg/normal/gadgets/music_control/base"; + rel1.to_y: "previous_btn"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + offscale; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color_class: "/bg/pressed/gadgets/music_control/base"; + } + } part { name: "player_name"; type: TEXT; scale : 1; description { state: "default" 0; align: 0.5 0.0; - color: 255 255 255 255; + color_class: "/fg/normal/gadgets/music_control/text/title"; text.size: 10; text.text: "Music player"; text.min: 0 1; @@ -165,8 +179,7 @@ group { name: "e/modules/music-control/popup"; scale : 1; description { state: "default" 0; align: 0.5 0.0; - text { - style: "music_control_metadata_style"; + text { style: "music_control_metadata_style"; text: "Song Title"; align: 0.0 0.0; min: 0 0; @@ -179,26 +192,12 @@ group { name: "e/modules/music-control/popup"; offscale; } } - part { name: "btn_back"; type: RECT; - scale: 1; - description { state: "default" 0; - color: 0 0 0 128; - rel1.to_y: "previous_btn"; - rel1.offset: -4 -4; - rel2.offset: 3 3; - offscale; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 0 0 0 220; - } - } part { name: "pos_txt"; type: TEXT; scale : 1; description { state: "default" 0; min: 64 15; rel.to: "btn_back"; - color: 255 255 255 255; + color_class: "/fg/normal/gadgets/music_control/text/position"; align: 0.5 1.0; text.size: 10; text.font: FN; @@ -215,7 +214,7 @@ group { name: "e/modules/music-control/popup"; description { state: "default" 0; min: 64 15; rel.to: "btn_back"; - color: 255 255 255 255; + color_class: "/fg/normal/gadgets/music_control/text/length"; align: 0.5 1.0; text.size: 10; text.font: FN; @@ -235,10 +234,12 @@ group { name: "e/modules/music-control/popup"; max: 15 15; align: 0.5 1.0; image.normal: "i-media-pause"; + color_class: "/fg/normal/gadgets/music_control/button/pause"; } description { state: "play" 0.0; inherit: "default" 0.0; image.normal: "i-media-play"; + color_class: "/fg/normal/gadgets/music_control/button/play"; } } part { name: "loop"; @@ -254,6 +255,7 @@ group { name: "e/modules/music-control/popup"; offscale; image.normal: "i-reload"; visible: 0; + color_class: "/fg/normal/gadgets/music_control/button/loop"; } description { state: "loop" 0.0; inherit: "default" 0.0; @@ -270,6 +272,7 @@ group { name: "e/modules/music-control/popup"; rel1.relative: -2.0 0.0; rel2.relative: -1.0 1.0; image.normal: "i-media-prev"; + color_class: "/fg/normal/gadgets/music_control/button/prev"; } } part { name: "next_btn"; @@ -282,6 +285,7 @@ group { name: "e/modules/music-control/popup"; rel1.relative: 2.0 0.0; rel2.relative: 3.0 1.0; image.normal: "i-media-next"; + color_class: "/fg/normal/gadgets/music_control/button/next"; } } part { name: "pos"; type: RECT; @@ -289,7 +293,7 @@ group { name: "e/modules/music-control/popup"; mouse_events: 0; description { state: "default" 0; fixed: 1 1; - color: 51 153 255 255; + color_class: "/fg/normal/gadgets/music_control/progress"; rel.to: "btn_back"; rel1.offset: 0 -1; rel1.relative: 0.0 1.0; diff --git a/data/elementary/themes/edc/notification.edc b/data/elementary/themes/edc/notification.edc index 29cc83d5fe..a59443ba98 100644 --- a/data/elementary/themes/edc/notification.edc +++ b/data/elementary/themes/edc/notification.edc @@ -4,9 +4,8 @@ group { name: "e/modules/notification/logo"; part { name: "spacer"; type: SPACER; scale: 1; description { state: "default" 0.0; - aspect: 1.0 1.0; aspect_preference: BOTH; - min: 48 48; - max: 48 48; + min: 40 40; + max: 40 40; } } part { name: "base"; mouse_events: 0; @@ -14,6 +13,7 @@ group { name: "e/modules/notification/logo"; description { state: "default" 0.0; image.normal: "exclam.png"; aspect: (56/160) (56/160); aspect_preference: BOTH; + color_class: "/fg/normal/notification/logo"; fixed: 1 1; } } @@ -21,53 +21,38 @@ group { name: "e/modules/notification/logo"; } group { name: "e/modules/notification/main"; - images.image: "win_shadow.png" COMP; - data.item: "app_icon_max" "48 48"; + images.image: "win_shad_flat.png" COMP; + data.item: "app_icon_max" "40 40"; styles { style { name: "notification_style"; - base: "font="FN" font_size=10 align=left color=#a0a0a0ff wrap=word text_class=notification_body"; - tag: "subject" "+ text_class=module_large color=#3399ffff align=center"; + base: "font="FN" font_size=10 align=left color=cc:/fg/normal/notification/text wrap=word text_class=notification_body"; + tag: "subject" "+ text_class=module_large color=cc:/fg/normal/notification/text/subject align=center"; tag: "body" "+ text_class=module_normal"; tag: "br" "\n"; tag: "ps" "ps"; - tag: "b" "+ font="FNBD" text_class=module_bold color=#ffff"; + tag: "b" "+ font="FNBD" text_class=module_bold color=cc:/fg/normal/notification/text/bold"; tag: "i" "+ font="FNIT" text_class=module_italic"; - tag: "u" "+ underline=on underline_color=#3399ffff"; + tag: "u" "+ underline=on underline_color=cc:/fg/normal/notification/text/underline"; tag: "img" ""; // images not supported tag: "a" ""; // links not supported } } parts { - part { name: "rel1"; type: SPACER; - scale: 1; + part { name: "shadow"; type: RECT; description { state: "default" 0.0; - align: 0.0 0.0; - min: 32 32; - max: 32 32; - } - } - part { name: "rel2"; type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 1.0 1.0; - min: 32 32; - max: 32 32; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - rel.to: "base"; - WIN_SHADOW; + rel.to: "_sh1"; + color_class: "/shadow/normal/notification"; } } + WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.to: "rel1"; - rel1.relative: 1.0 1.0; - rel2.to: "rel2"; - rel2.relative: 0.0 0.0; - color: 0 0 0 192; + rel1.offset: 32 32; + rel2.offset: -33 -33; + color_class: "/bg/normal/notification"; + offscale; } } part { name: "titleclip"; type: RECT; @@ -77,10 +62,9 @@ group { name: "e/modules/notification/main"; } } part { name: "bodyclip"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - rel2.offset: -13 -13; + rel.to: "base"; min: 220 80; } } @@ -90,22 +74,21 @@ group { name: "e/modules/notification/main"; align: 0.0 0.5; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.offset: 12 12; rel2.offset: 12 -13; rel2.relative: 0.0 1.0; min: 24 24; fixed: 1 1; + offscale; } } part { name: "notification.textblock.message"; type: TEXTBLOCK; mouse_events: 0; clip_to: "bodyclip"; - scale; + scale: 1; description { state: "default" 0.0; align: 0.0 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.to_x: "notification.swallow.app_icon"; rel1.to_y: "notification.text.title"; rel1.relative: 1.0 1.0; @@ -115,6 +98,7 @@ group { name: "e/modules/notification/main"; min: 0 1; } fixed: 1 1; + offscale; } } part { name: "message"; type: TEXTBLOCK; mouse_events: 0; @@ -123,8 +107,7 @@ group { name: "e/modules/notification/main"; align: 0.0 0.0; min: 200 20; max: 400 99999; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.to_x: "notification.swallow.app_icon"; rel1.to_y: "notification.text.title"; rel1.relative: 1.0 1.0; @@ -135,21 +118,21 @@ group { name: "e/modules/notification/main"; min: 0 1; } visible: 0; + offscale; } } part { name: "notification.text.title"; type: TEXT; mouse_events: 0; clip_to: "titleclip"; scale: 1; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.to_x: "notification.swallow.app_icon"; rel1.relative: 1.0 0.0; rel1.offset: 4 12; rel2.relative: 0.0 0.0; rel2.to_x: "notification.event.close"; rel2.offset: -5 12; - color: 255 255 255 255; + color_class: "/fg/normal/notification/text/title"; align: 0.0 0.0; text { font: FNBD; size: 10; min: 0 1; @@ -157,28 +140,29 @@ group { name: "e/modules/notification/main"; text_class: "notification_title"; } fixed: 0 1; + offscale; } } part { name: "close"; + scale: 1; description { state: "default" 0.0; image.normal: "i-close"; rel.to: "notification.event.close"; min: 15 15; max: 15 15; fixed: 1 1; - color: 255 255 255 255; + color_class: "/fg/normal/notification/button/close"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 128 128 128 255; + color_class: "/fg/pressed/notification/button/close"; } } part { name: "notification.event.close"; type: RECT; scale: 1; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.relative: 1.0 0.0; rel1.offset: -13 12; rel2.relative: 1.0 0.0; @@ -187,26 +171,23 @@ group { name: "e/modules/notification/main"; min: 15 15; color: 0 0 0 0; fixed: 1 1; + offscale; } } } programs { - program { - signal: "mouse,down,1"; source: "notification.event.close"; + program { signal: "mouse,down,1"; source: "notification.event.close"; action: STATE_SET "selected" 0.0; target: "close"; } - program { - signal: "mouse,up,1"; source: "notification.event.close"; + program { signal: "mouse,up,1"; source: "notification.event.close"; action: STATE_SET "default" 0.0; target: "close"; } - program { - signal: "mouse,clicked,1"; source: "notification.event.close"; + program { signal: "mouse,clicked,1"; source: "notification.event.close"; action: SIGNAL_EMIT "notification,close" "theme"; } - program { - signal: "mouse,clicked,1"; source: "base"; + program { signal: "mouse,clicked,1"; source: "base"; action: SIGNAL_EMIT "notification,find" "theme"; } // program {