discomfitor pushed a commit to branch master. http://git.enlightenment.org/themes/darkness.git/commit/?id=9139ac2ab16ba389595344f8bec494991c34edc5
commit 9139ac2ab16ba389595344f8bec494991c34edc5 Author: Mike Blumenkrantz <[email protected]> Date: Thu Aug 24 13:44:41 2017 -0400 update to be a single theme that works with current enlightenment/efl this drops support for mobile profile scrollers but yolo --- build.sh | 2 +- darkness.edc | 3 + elm/darkness-common.edc | 4 - elm/darkness-desktop.edc | 4 - elm/darkness.edc | 1907 +--------------------------------------------- elm/macros/colors.h | 18 + elm/macros/style.h | 1 + 7 files changed, 24 insertions(+), 1915 deletions(-) diff --git a/build.sh b/build.sh index 98576d2..f58a80e 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash v=$(git log --oneline|wc -l) -edje_cc -DVERSION=\"$v\" -id images/ -fd . darkness.edc -o darkness.edj +edje_cc -DVERSION=\"$v\" -id images -id elm/images -fd . darkness.edc -o darkness.edj [[ $? != 0 ]] && exit 1 case "$1" in '-p') diff --git a/darkness.edc b/darkness.edc index e6ef874..c62f1ca 100644 --- a/darkness.edc +++ b/darkness.edc @@ -139,6 +139,7 @@ transition: SINUSOIDAL 0.2; \ } +data.item: "version" "110"; data { item: "theme/name" "Darkness"; item: "theme/version" VERSION; @@ -210,5 +211,7 @@ collections { #include "widgets/textblock.edc" #include "widgets/tlist.edc" #include "widgets/winlist.edc" + +#include "elm/darkness.edc" } diff --git a/elm/darkness-common.edc b/elm/darkness-common.edc index 85d7655..8fda877 100755 --- a/elm/darkness-common.edc +++ b/elm/darkness-common.edc @@ -16,7 +16,6 @@ #include "macros/tree_header.h" #include "macros/widget.h" -data.item: "version" "110"; styles { STYLE("Label", "Sans", "Sans:style=Bold", "Sans:style=Oblique", "Sans:style=BoldOblique", "Sans-Mono", "10", @@ -38,8 +37,6 @@ styles externals.external: "elm"; -collections { - /////////////////////////////////////////////////////////////////////////////// group { name: "elm/focus_highlight/top/default"; images { @@ -1296,4 +1293,3 @@ collections { } } } -} diff --git a/elm/darkness-desktop.edc b/elm/darkness-desktop.edc index 4e21421..e70b550 100644 --- a/elm/darkness-desktop.edc +++ b/elm/darkness-desktop.edc @@ -1,4 +1,3 @@ -#include "darkness-common.edc" externals.external: "elm"; #define SCROLLBARS_ADD() \ @@ -689,8 +688,6 @@ externals.external: "elm"; } \ } \ -collections { - group { name: "elm/scroller/base/default"; alias: "elm/list/base/default"; alias: "elm/genlist/base/default"; @@ -1247,4 +1244,3 @@ collections { } } } -} diff --git a/elm/darkness.edc b/elm/darkness.edc index 847a8cb..6607375 100755 --- a/elm/darkness.edc +++ b/elm/darkness.edc @@ -1,1907 +1,2 @@ #include "darkness-common.edc" -collections { - group { name: "elm/scroller/base/default"; - - alias: "elm/list/base/default"; - alias: "elm/genlist/base/default"; - alias: "elm/carousel/base/default"; - alias: "elm/gengrid/base/default"; - alias: "elm/scroller/base/map_bubble"; - - data { - item: "focus_highlight" "on"; - } - - script { - public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; - public timer0(val) { - new v; - v = get_int(sbvis_v); - if (v) { - v = get_int(sbalways_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - v = get_int(sbvis_h); - if (v) { - v = get_int(sbalways_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - set_int(sbvis_timer, 0); - return 0; - } - } - images { - image: "shelf_inset.png" COMP; - image: "slider_bar.png" COMP; - image: "scrollbar_vdrag1.png" COMP; - image: "scrollbar_hdrag1.png" COMP; - image: "scrollbar_vdrag_thumb.png" COMP; - image: "scrollbar_hdrag_thumb.png" COMP; - image: "entry_over.png" COMP; - } - parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - color: 255 255 255 0; - } - } - part { name: "clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; - } - } - part { name: "elm.swallow.content"; - clip_to: "clipper"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; - } - } - part { name: "conf_over"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image { - normal: "shelf_inset.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - color: 200 155 0 255; - } - } - part { name: "focus_highlight"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -1 -1; - rel2.offset: 0 0; - image { - normal: "entry_over.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - color: 200 155 0 0; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - color: 200 155 0 255; - } - } - SCROLLER_PART_VBAR_CLIP - part { name: "sb_vbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 10 17; - align: 1.0 0.0; - rel1 { - relative: 1.0 0.0; - offset: 0 2; - to_y: "elm.swallow.content"; - to_x: "elm.swallow.content"; - } - rel2 { - relative: 1.0 0.0; - offset: -1 -1; - to_y: "sb_hbar"; - to_x: "elm.swallow.content"; - } - } - } - part { name: "elm.dragable.vbar"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - dragable { - x: 0 0 0; - y: 1 1 0; - confine: "sb_vbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 10 17; - max: 10 99999; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - image { - normal: "slider_bar.png"; - border: 2 2 2 2; - } - } - } - part { name: "sb_vbar_over1"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - color: 255 255 255 255; - rel1.to: "elm.dragable.vbar"; - rel2.relative: 1.0 1.0; - rel2.to: "elm.dragable.vbar"; - image { - normal: "scrollbar_vdrag1.png"; - border: 6 6 6 0; - } - } - } - SCROLLER_PART_VBAR_THUMB - SCROLLER_PART_HBAR_CLIP - part { name: "sb_hbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 17 10; - align: 0.0 1.0; - rel1 { - relative: 0.0 1.0; - offset: 2 0; - to_x: "elm.swallow.content"; - to_y: "elm.swallow.content"; - } - rel2 { - relative: 0.0 1.0; - offset: -1 -1; - to_x: "sb_vbar"; - to_y: "elm.swallow.content"; - } - } - } - part { name: "elm.dragable.hbar"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "sb_hbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 17 10; - max: 99999 10; - rel1 { - relative: 0.5 0.5; - to: "sb_hbar"; - } - rel2 { - relative: 0.5 0.5; - to: "sb_hbar"; - } - image { - normal: "slider_bar.png"; - border: 2 2 2 2; - } - } - } - part { name: "sb_hbar_over1"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - color: 255 255 255 255; - rel1.to: "elm.dragable.hbar"; - rel2.relative: 1.0 1.0; - rel2.to: "elm.dragable.hbar"; - image { - normal: "scrollbar_hdrag1.png"; - border: 4 4 4 0; - } - } - } - SCROLLER_PART_HBAR_THUMB - SCROLLER_PART_DISABLER - } - programs { - program { name: "load"; - signal: "load"; - source: ""; - script { - set_state(PART:"sb_hbar_clip", "hidden", 0.0); - set_state(PART:"sb_vbar_clip", "hidden", 0.0); - set_int(sbvis_h, 0); - set_int(sbvis_v, 0); - set_int(sbalways_v, 0); - set_int(sbalways_h, 0); - set_int(sbvis_timer, 0); - } - } - - program { name: "vbar_show"; - signal: "elm,action,show,vbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_hide"; - signal: "elm,action,hide,vbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_show_always"; - signal: "elm,action,show_always,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - set_int(sbalways_v, 1); - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - } - } - program { name: "vbar_show_notalways"; - signal: "elm,action,show_notalways,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_v); - if (v) { - set_int(sbalways_v, 0); - v = get_int(sbvis_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - } - } - program { name: "sb_vbar_show"; - signal: "do-show-vbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - program { name: "sb_vbar_hide"; - signal: "do-hide-vbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - - program { name: "hbar_show"; - signal: "elm,action,show,hbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_hide"; - signal: "elm,action,hide,hbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_show_always"; - signal: "elm,action,show_always,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - set_int(sbalways_h, 1); - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - } - } - program { name: "hbar_show_notalways"; - signal: "elm,action,show_notalways,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_h); - if (v) { - set_int(sbalways_h, 0); - v = get_int(sbvis_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - } - } - program { name: "sb_hbar_show"; - signal: "do-show-hbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - program { name: "sb_hbar_hide"; - signal: "do-hide-hbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - - program { name: "scroll"; - signal: "elm,action,scroll"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - v = get_int(sbvis_timer); - if (v > 0) cancel_timer(v); - v = timer(1.0, "timer0", 0); - set_int(sbvis_timer, v); - } - } - - program { name: "highlight_show"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "enabled" 0.0; - transition: ACCELERATE 0.3; - target: "focus_highlight"; - target: "conf_over"; - } - program { name: "highlight_hide"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "focus_highlight"; - target: "conf_over"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disabler"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disabler"; - } - } - } - -/////////////////////////////////////////////////////////////////////////////// - group { name: "elm/scroller/entry/default"; - - data { - item: "focus_highlight" "on"; - } - - script { - public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; - public timer0(val) { - new v; - v = get_int(sbvis_v); - if (v) { - v = get_int(sbalways_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - v = get_int(sbvis_h); - if (v) { - v = get_int(sbalways_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - set_int(sbvis_timer, 0); - return 0; - } - } - images { - image: "shelf_inset.png" COMP; - image: "slider_bar.png" COMP; - image: "slider_button_glow.png" COMP; - image: "entry_over.png" COMP; - } - parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - color: 0 0 0 255; - } - } - part { name: "clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; - } - } - part { name: "contentclipper"; - type: RECT; - mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel1.relative: 1.0 0.0; - rel2.to: "elm.swallow.end"; - rel2.relative: 0.0 1.0; - } - } - part { name: "elm.swallow.icon"; - type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - fixed: 1 1; - rel1 { - to: "bg"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 0.0 1.0; - offset: -1 -1; - } - visible: 0; - } - description { state: "visible" 0.0; - fixed: 1 1; - align: 0.0 1.0; - rel1 { - to: "bg"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 0.0 1.0; - offset: -1 -1; - } - visible: 1; - } - } - part { name: "elm.swallow.end"; - type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - fixed: 1 1; - rel1 { - to: "bg"; - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 1.0 1.0; - offset: -1 -1; - } - visible: 0; - } - description { state: "visible" 0.0; - fixed: 1 1; - align: 1.0 1.0; - rel1 { - to: "bg"; - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 1.0 1.0; - offset: -1 -1; - } - visible: 1; - } - } - part { name: "elm.swallow.content"; - clip_to: "contentclipper"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - to: "elm.swallow.icon"; - relative: 1.0 0.0; - offset: 4 4; - } - rel2 { - to: "elm.swallow.end"; - relative: 0.0 1.0; - offset: -5 -5; - } - } - } - part { name: "conf_over"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image { - normal: "shelf_inset.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - color: 200 155 0 255; - } - } - part { name: "focus_highlight"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -1 -1; - rel2.offset: 0 0; - image { - normal: "entry_over.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - color: 200 155 0 0; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - color: 200 155 0 255; - } - } - part { name: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar_clip"; - clip_to: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 10 17; - align: 1.0 0.0; - rel1 { - relative: 0.0 0.0; - offset: -2 2; - to_y: "elm.swallow.content"; - to_x: "elm.swallow.end"; - } - rel2 { - relative: 0.0 0.0; - offset: -2 -1; - to_y: "sb_hbar"; - to_x: "elm.swallow.end"; - } - } - } - part { name: "elm.dragable.vbar"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - dragable { - x: 0 0 0; - y: 1 1 0; - confine: "sb_vbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 10 17; - max: 10 99999; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - image { - normal: "slider_bar.png"; - border: 2 2 2 2; - } - } - } - part { name: "sb_vbar_over1"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.vbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.vbar"; - image { - normal: "slider_button_glow.png"; - border: 6 6 6 0; - } - } - } - - part { name: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar_clip"; - clip_to: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 17 10; - align: 0.0 1.0; - rel1 { - relative: 0.0 1.0; - offset: 2 0; - to_x: "elm.swallow.content"; - to_y: "elm.swallow.content"; - } - rel2 { - relative: 0.0 1.0; - offset: -1 -1; - to_x: "sb_vbar"; - to_y: "elm.swallow.content"; - } - } - } - part { name: "elm.dragable.hbar"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "sb_hbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 17 10; - max: 99999 10; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - image { - normal: "slider_bar.png"; - border: 2 2 2 2; - } - } - } - part { name: "sb_hbar_over1"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.hbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.hbar"; - image { - normal: "slider_button_glow.png"; - border: 4 4 4 0; - } - } - } - } - programs { - program { name: "load"; - signal: "load"; - source: ""; - script { - set_state(PART:"sb_hbar_clip", "hidden", 0.0); - set_state(PART:"sb_vbar_clip", "hidden", 0.0); - set_int(sbvis_h, 0); - set_int(sbvis_v, 0); - set_int(sbalways_v, 0); - set_int(sbalways_h, 0); - set_int(sbvis_timer, 0); - } - } - program { name: "icon_show"; - signal: "elm,action,show,icon"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; - } - program { name: "icon_hide"; - signal: "elm,action,hide,icon"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; - } - program { name: "end_show"; - signal: "elm,action,show,end"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.end"; - } - program { name: "end_hide"; - signal: "elm,action,hide,end"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.end"; - } - program { name: "vbar_show"; - signal: "elm,action,show,vbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_hide"; - signal: "elm,action,hide,vbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_show_always"; - signal: "elm,action,show_always,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - set_int(sbalways_v, 1); - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - } - } - program { name: "vbar_show_notalways"; - signal: "elm,action,show_notalways,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_v); - if (v) { - set_int(sbalways_v, 0); - v = get_int(sbvis_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - } - } - program { name: "sb_vbar_show"; - signal: "do-show-vbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - program { name: "sb_vbar_hide"; - signal: "do-hide-vbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - - program { name: "hbar_show"; - signal: "elm,action,show,hbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_hide"; - signal: "elm,action,hide,hbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_show_always"; - signal: "elm,action,show_always,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - set_int(sbalways_h, 1); - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - } - } - program { name: "hbar_show_notalways"; - signal: "elm,action,show_notalways,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_h); - if (v) { - set_int(sbalways_h, 0); - v = get_int(sbvis_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - } - } - program { name: "sb_hbar_show"; - signal: "do-show-hbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - program { name: "sb_hbar_hide"; - signal: "do-hide-hbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - - program { name: "scroll"; - signal: "elm,action,scroll"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - v = get_int(sbvis_timer); - if (v > 0) cancel_timer(v); - v = timer(1.0, "timer0", 0); - set_int(sbvis_timer, v); - } - } - - program { name: "highlight_show"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "enabled" 0.0; - transition: ACCELERATE 0.3; - target: "focus_highlight"; - target: "conf_over"; - } - program { name: "highlight_hide"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "focus_highlight"; - target: "conf_over"; - } - } - } - group { name: "elm/map/base/default"; - script { - public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; - public timer0(val) { - new v; - v = get_int(sbvis_v); - if (v) { - v = get_int(sbalways_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - v = get_int(sbvis_h); - if (v) { - v = get_int(sbalways_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - set_int(sbvis_timer, 0); - return 0; - } - } - images { - image: "shelf_inset.png" COMP; - image: "slider_button.png" COMP; - image: "menu_item_highlight.png" COMP; - image: "busy-1.png" COMP; - image: "busy-2.png" COMP; - image: "busy-3.png" COMP; - image: "busy-4.png" COMP; - image: "busy-5.png" COMP; - image: "busy-6.png" COMP; - image: "busy-7.png" COMP; - image: "busy-8.png" COMP; - image: "busy-9.png" COMP; - } - parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - color: 255 255 255 0; - } - } - part { name: "clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - } - part { name: "elm.swallow.content"; - clip_to: "clipper"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - } - } - part { name: "busy_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - } - description { state: "active" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "busy"; - clip_to: "busy_clip"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - min: 32 32; - aspect: 1.0 1.0; - align: 1.0 1.0; - aspect_preference: BOTH; - rel1 { - relative: 0.9 0.9; - offset: -9 -9; - } - rel2 { - relative: 0.9 0.9; - offset: -9 -9; - } - image { - normal: "busy-9.png"; - tween: "busy-1.png"; - tween: "busy-2.png"; - tween: "busy-3.png"; - tween: "busy-4.png"; - tween: "busy-5.png"; - tween: "busy-6.png"; - tween: "busy-7.png"; - tween: "busy-8.png"; - } - } - } - part { name: "conf_over"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 0 0; - rel2.offset: -1 -1; - image { - normal: "shelf_inset.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - } - } - part { name: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar_clip"; - clip_to: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 10 17; - align: 1.0 0.0; - rel1 { - relative: 1.0 0.0; - offset: -2 0; - } - rel2 { - relative: 1.0 0.0; - offset: -2 -1; - to_y: "sb_hbar"; - } - } - } - part { name: "elm.dragable.vbar"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - dragable { - x: 0 0 0; - y: 1 1 0; - confine: "sb_vbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 10 17; - max: 10 99999; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - image { - normal: "slider_button.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - } - part { name: "sb_vbar_over1"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.vbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.vbar"; - image { - normal: "menu_item_highlight.png"; - border: 6 6 6 0; - } - } - } - part { name: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar_clip"; - clip_to: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 17 10; - align: 0.0 1.0; - rel1 { - relative: 0.0 1.0; - offset: 0 -2; - } - rel2 { - relative: 0.0 1.0; - offset: -1 -2; - to_x: "sb_vbar"; - } - } - } - part { name: "elm.dragable.hbar"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "sb_hbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 17 10; - max: 99999 10; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - image { - normal: "slider_button.png"; - border: 4 4 4 4; - middle: SOLID; - } - } - } - part { name: "sb_hbar_over1"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.hbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.hbar"; - image { - normal: "menu_item_highlight.png"; - border: 4 4 4 0; - } - } - } - } - programs { - program { name: "load"; - signal: "load"; - source: ""; - script { - set_state(PART:"sb_hbar_clip", "hidden", 0.0); - set_state(PART:"sb_vbar_clip", "hidden", 0.0); - set_int(sbvis_h, 0); - set_int(sbvis_v, 0); - set_int(sbalways_v, 0); - set_int(sbalways_h, 0); - set_int(sbvis_timer, 0); - } - } - - program { name: "vbar_show"; - signal: "elm,action,show,vbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_hide"; - signal: "elm,action,hide,vbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_show_always"; - signal: "elm,action,show_always,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - set_int(sbalways_v, 1); - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - } - } - program { name: "vbar_show_notalways"; - signal: "elm,action,show_notalways,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_v); - if (v) { - set_int(sbalways_v, 0); - v = get_int(sbvis_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - } - } - program { name: "sb_vbar_show"; - signal: "do-show-vbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - program { name: "sb_vbar_hide"; - signal: "do-hide-vbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - - program { name: "hbar_show"; - signal: "elm,action,show,hbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_hide"; - signal: "elm,action,hide,hbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_show_always"; - signal: "elm,action,show_always,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - set_int(sbalways_h, 1); - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - } - } - program { name: "hbar_show_notalways"; - signal: "elm,action,show_notalways,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_h); - if (v) { - set_int(sbalways_h, 0); - v = get_int(sbvis_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - } - } - program { name: "sb_hbar_show"; - signal: "do-show-hbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - program { name: "sb_hbar_hide"; - signal: "do-hide-hbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - - program { name: "scroll"; - signal: "elm,action,scroll"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - v = get_int(sbvis_timer); - if (v > 0) cancel_timer(v); - v = timer(1.0, "timer0", 0); - set_int(sbvis_timer, v); - } - } - program { name: "go1"; - signal: "elm,state,busy,start"; - source: "elm"; - action: STATE_SET "active" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - } - program { name: "go2"; - signal: "elm,state,busy,start"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "busy"; - after: "go2"; - } - program { name: "stop1"; - signal: "elm,state,busy,stop"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - after: "stop2"; - } - program { name: "stop2"; - action: ACTION_STOP; - target: "go2"; - } - } - } - group { name: "elm/photocam/base/default"; - script { - public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; - public timer0(val) { - new v; - v = get_int(sbvis_v); - if (v) { - v = get_int(sbalways_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - v = get_int(sbvis_h); - if (v) { - v = get_int(sbalways_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - set_int(sbvis_timer, 0); - return 0; - } - } - images { - image: "shelf_inset.png" COMP; - image: "slider_button.png" COMP; - image: "menu_item_highlight.png" COMP; - image: "busy-1.png" COMP; - image: "busy-2.png" COMP; - image: "busy-3.png" COMP; - image: "busy-4.png" COMP; - image: "busy-5.png" COMP; - image: "busy-6.png" COMP; - image: "busy-7.png" COMP; - image: "busy-8.png" COMP; - image: "busy-9.png" COMP; - } - parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - color: 255 255 255 0; - } - } - part { name: "clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - } - part { name: "elm.swallow.content"; - clip_to: "clipper"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - } - } - part { name: "busy_clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - } - description { state: "active" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "busy"; - clip_to: "busy_clip"; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - min: 32 32; - aspect: 1.0 1.0; - align: 1.0 1.0; - aspect_preference: BOTH; - rel1 { - relative: 0.9 0.9; - offset: -9 -9; - } - rel2 { - relative: 0.9 0.9; - offset: -9 -9; - } - image { - normal: "busy-9.png"; - tween: "busy-1.png"; - tween: "busy-2.png"; - tween: "busy-3.png"; - tween: "busy-4.png"; - tween: "busy-5.png"; - tween: "busy-6.png"; - tween: "busy-7.png"; - tween: "busy-8.png"; - } - } - } - part { name: "conf_over"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 0 0; - rel2.offset: -1 -1; - image { - normal: "shelf_inset.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - } - } - part { name: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar_clip"; - clip_to: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 10 17; - align: 1.0 0.0; - rel1 { - relative: 1.0 0.0; - offset: -2 0; - } - rel2 { - relative: 1.0 0.0; - offset: -2 -1; - to_y: "sb_hbar"; - } - } - } - part { name: "elm.dragable.vbar"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - dragable { - x: 0 0 0; - y: 1 1 0; - confine: "sb_vbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 10 17; - max: 10 99999; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - image { - normal: "slider_button.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - } - part { name: "sb_vbar_over1"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.vbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.vbar"; - image { - normal: "menu_item_highlight.png"; - border: 6 6 6 0; - } - } - } - part { name: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar_clip"; - clip_to: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 17 10; - align: 0.0 1.0; - rel1 { - relative: 0.0 1.0; - offset: 0 -2; - } - rel2 { - relative: 0.0 1.0; - offset: -1 -2; - to_x: "sb_vbar"; - } - } - } - part { name: "elm.dragable.hbar"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "sb_hbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 17 10; - max: 99999 10; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - image { - normal: "slider_button.png"; - border: 4 4 4 4; - middle: SOLID; - } - } - } - part { name: "sb_hbar_over1"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.hbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.hbar"; - image { - normal: "menu_item_highlight.png"; - border: 4 4 4 0; - } - } - } - } - programs { - program { name: "load"; - signal: "load"; - source: ""; - script { - set_state(PART:"sb_hbar_clip", "hidden", 0.0); - set_state(PART:"sb_vbar_clip", "hidden", 0.0); - set_int(sbvis_h, 0); - set_int(sbvis_v, 0); - set_int(sbalways_v, 0); - set_int(sbalways_h, 0); - set_int(sbvis_timer, 0); - } - } - - program { name: "vbar_show"; - signal: "elm,action,show,vbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_hide"; - signal: "elm,action,hide,vbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_show_always"; - signal: "elm,action,show_always,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - set_int(sbalways_v, 1); - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - } - } - program { name: "vbar_show_notalways"; - signal: "elm,action,show_notalways,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_v); - if (v) { - set_int(sbalways_v, 0); - v = get_int(sbvis_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - } - } - program { name: "sb_vbar_show"; - signal: "do-show-vbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - program { name: "sb_vbar_hide"; - signal: "do-hide-vbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - - program { name: "hbar_show"; - signal: "elm,action,show,hbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_hide"; - signal: "elm,action,hide,hbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_show_always"; - signal: "elm,action,show_always,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - set_int(sbalways_h, 1); - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - } - } - program { name: "hbar_show_notalways"; - signal: "elm,action,show_notalways,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_h); - if (v) { - set_int(sbalways_h, 0); - v = get_int(sbvis_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - } - } - program { name: "sb_hbar_show"; - signal: "do-show-hbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - program { name: "sb_hbar_hide"; - signal: "do-hide-hbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - - program { name: "scroll"; - signal: "elm,action,scroll"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - v = get_int(sbvis_timer); - if (v > 0) cancel_timer(v); - v = timer(1.0, "timer0", 0); - set_int(sbvis_timer, v); - } - } - program { name: "go1"; - signal: "elm,state,busy,start"; - source: "elm"; - action: STATE_SET "active" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - } - program { name: "go2"; - signal: "elm,state,busy,start"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "busy"; - after: "go2"; - } - program { name: "stop1"; - signal: "elm,state,busy,stop"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - after: "stop2"; - } - program { name: "stop2"; - action: ACTION_STOP; - target: "go2"; - } - } - } - -} +#include "darkness-desktop.edc" diff --git a/elm/macros/colors.h b/elm/macros/colors.h index 543a153..762aec9 100644 --- a/elm/macros/colors.h +++ b/elm/macros/colors.h @@ -1,22 +1,40 @@ +#undef DARKNESS_VERY_DARK_BLUE #define DARKNESS_VERY_DARK_BLUE 12 20 28 +#undef DARKNESS_DARK_BLUE #define DARKNESS_DARK_BLUE 38 62 87 +#undef DARKNESS_BLUE #define DARKNESS_BLUE 56 82 109 +#undef DARKNESS_LIGHT_BLUE #define DARKNESS_LIGHT_BLUE 145 169 195 +#undef DARKNESS_VERY_LIGHT_BLUE #define DARKNESS_VERY_LIGHT_BLUE 201 212 225 +#undef DARKNESS_TITLE_BLUE #define DARKNESS_TITLE_BLUE 27 40 174 +#undef DARKNESS_BUTTON_BLUE #define DARKNESS_BUTTON_BLUE 68 156 200 +#undef DARKNESS_BRIGHT_BLUE #define DARKNESS_BRIGHT_BLUE 61 124 195 +#undef DARKNESS_BRIGHT_BLUE_DISABLED #define DARKNESS_BRIGHT_BLUE_DISABLED 41 104 175 +#undef DARKNESS_BUTTON_RED #define DARKNESS_BUTTON_RED 255 0 0 +#undef DARKNESS_BACKGROUND #define DARKNESS_BACKGROUND 10 10 10 +#undef DARKNESS_BORDER #define DARKNESS_BORDER 76 76 76 +#undef DARKNESS_MENU_BORDER #define DARKNESS_MENU_BORDER 76 76 76 +#undef DARKNESS_LIST_BORDER #define DARKNESS_LIST_BORDER 72 72 72 +#undef DARKNESS_LIST_ROW #define DARKNESS_LIST_ROW 1 1 1 +#undef DARKNESS_LIST_ROW_SELECT #define DARKNESS_LIST_ROW_SELECT 0 30 60 +#undef DARKNESS_TEXT #define DARKNESS_TEXT 255 255 255 +#undef DARKNESS_TEXT_DISABLED #define DARKNESS_TEXT_DISABLED 222 222 222 diff --git a/elm/macros/style.h b/elm/macros/style.h index c2b643d..0ac542a 100644 --- a/elm/macros/style.h +++ b/elm/macros/style.h @@ -1,3 +1,4 @@ +#undef STYLE #define STYLE(style_class, fn, fb, fi, fbi, fm, size, normal_style, title, subtitle, hilight, description) \ style { \ name: style_class; \ --
