raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd6e9f3e567caf0f4b6cc00d7a38181da3c995ba
commit cd6e9f3e567caf0f4b6cc00d7a38181da3c995ba
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Thu Jul 29 00:02:50 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 11 ++++
data/elementary/themes/edc/elm/radio.edc | 76 +++++++++++-----------
data/elementary/themes/edc/elm/slideshow.edc | 94 +++++++++++-----------------
data/elementary/themes/edc/elm/tooltip.edc | 14 ++---
4 files changed, 97 insertions(+), 98 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 504bae75ba..bf8cade741 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -204,16 +204,22 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/button";
color: 96 96 96 255; }
+ color_class { name: "/bg/selected/button";
+ color: 128 128 128 255; }
color_class { name: "/bg/pressed/button";
color: 80 80 80 255; }
color_class { name: "/bg/disabled/button";
color: 64 64 64 255; }
color_class { name: "/fg/normal/button";
color: 192 192 192 255; }
+ color_class { name: "/fg/selected/button";
+ color: 255 255 255 255; }
color_class { name: "/fg/pressed/button";
color: 255 255 255 255; }
color_class { name: "/fg/disabled/button";
color: 97 96 96 255; }
+ color_class { name: "/fg/selected/button/bar";
+ color: 51 153 255 255; }
color_class { name: "/fg/normal/button-anchor";
color: 51 153 255 255; }
color_class { name: "/fg/pressed/button-anchor";
@@ -445,6 +451,11 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/wizard/text/title";
color: 255 255 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/tooltip/text";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/toolip/text/hilight";
+ color: 51 153 255 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/gadgets/temperature/low";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/elm/radio.edc
b/data/elementary/themes/edc/elm/radio.edc
index 5920d162d1..482125e779 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -30,13 +30,13 @@ group { name: "elm/radio/base/default";
}
rect { "icon_clip";
desc { "default";
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
desc { "pressed"; inherit;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
desc { "disabled"; inherit;
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
swallow { "elm.swallow.content"; nomouse;
@@ -97,26 +97,26 @@ group { name: "elm/radio/base/default";
image.normal: "i-radio";
min: 15 15;
max: 15 15;
- color: 0 0 0 64;
+ color_class: "/bg/normal/radio/base";
fixed: 1 1;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/radio/base";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: 160 160 160 255;
+ color_class: "/fg/selected/radio/base";
}
desc { "disabled"; inherit;
- color: 0 0 0 16;
+ color_class: "/bg/disabled/radio/base";
}
}
text { "elm.text"; nomouse;
scale: 1;
desc { "default";
fixed: 0 1;
- color: 160 160 160 255;
+ color_class: "/fg/normal/radio/text";
rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
@@ -138,7 +138,7 @@ group { name: "elm/radio/base/default";
}
desc { "pressed_visible"; inherit;
fixed: 0 0;
- color: 255 255 255 255;
+ color_class: "/fg/prssed/radio/text";
rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
@@ -152,14 +152,14 @@ group { name: "elm/radio/base/default";
}
desc { "pressed_textonly"; inherit;
fixed: 0 0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/radio/text";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "disabled_visible"; inherit;
fixed: 0 0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/radio/text";
rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
@@ -167,7 +167,7 @@ group { name: "elm/radio/base/default";
}
desc { "disabled_textonly"; inherit;
fixed: 0 0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/radio/text";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
@@ -176,7 +176,7 @@ group { name: "elm/radio/base/default";
rect { "event";
ignore_flags: ON_HOLD;
desc { "default";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
desc { "disabled"; inherit;
visible: 0;
@@ -347,29 +347,31 @@ group { name: "elm/radio/base/plain";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+ color_class: "/shadow/normal/button";
}
description { state: "selected" 0.0; inherit;
image.border_scale_by: 0.1;
rel1.offset: -2 -1;
rel2.offset: 0 1;
+ color_class: "/shadow/pressed/button";
}
}
rect { name: "base"; nomouse;
scale: 1;
desc { "default";
- color: 96 96 96 255;
+ color_class: "/bg/normal/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "selected"; inherit;
- color: 128 128 128 255;
+ color_class: "/bg/selected/button";
rel1.offset: 3 3;
rel2.offset: -4 -4;
offscale;
}
desc { "disabled"; inherit;
- color: 72 72 72 255;
+ color_class: "/bg/disabled/button";
}
}
part { name: "clip"; type: RECT;
@@ -377,7 +379,7 @@ group { name: "elm/radio/base/plain";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
part { name: "elm.swallow.content"; type: SWALLOW;
@@ -422,7 +424,7 @@ group { name: "elm/radio/base/plain";
rel1.to_x: "elm.swallow.content";
rel1.relative: 1.0 0.0;
rel2.offset: -9 -9;
- color: 192 192 192 255;
+ color_class: "/fg/normal/button";
text { font: FN; size: 10;
min: 0 0;
align: 0.0 0.5;
@@ -433,7 +435,7 @@ group { name: "elm/radio/base/plain";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -445,11 +447,11 @@ group { name: "elm/radio/base/plain";
}
description { state: "selected" 0.0;
inherit: "visible" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/button";
}
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
rel1.offset: 8 8;
visible: 1;
text.min: 1 1;
@@ -459,7 +461,8 @@ group { name: "elm/radio/base/plain";
rect { "bar"; nomouse;
scale: 1;
desc { "default";
- color: 51 153 255 0;
+ color_class: "/fg/selected/button/bar";
+ color: 255 255 255 0; // no cc
fixed: 0 1;
rel.to: "base";
rel1.relative: 0.0 1.0;
@@ -469,13 +472,13 @@ group { name: "elm/radio/base/plain";
}
desc { "selected"; inherit;
min: 0 5;
- color: 51 153 255 255;
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
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;
@@ -650,29 +653,31 @@ group { name: "elm/radio/base/icon";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+ color_class: "/shadow/normal/button";
}
description { state: "selected" 0.0; inherit;
image.border_scale_by: 0.1;
rel1.offset: -2 -1;
rel2.offset: 0 1;
+ color_class: "/shadow/pressed/button";
}
}
rect { name: "base"; nomouse;
scale: 1;
desc { "default";
- color: 96 96 96 255;
+ color_class: "/bg/normal/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "selected"; inherit;
- color: 128 128 128 255;
+ color_class: "/bg/selected/button";
rel1.offset: 3 3;
rel2.offset: -4 -4;
offscale;
}
desc { "disabled"; inherit;
- color: 72 72 72 255;
+ color_class: "/bg/disabled/button";
}
}
part { name: "clip"; type: RECT;
@@ -680,7 +685,7 @@ group { name: "elm/radio/base/icon";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
part { name: "elm.swallow.content"; type: SWALLOW;
@@ -726,7 +731,7 @@ group { name: "elm/radio/base/icon";
rel1.to_y: "elm.swallow.content";
rel1.relative: 0.0 1.0;
rel2.offset: -9 -9;
- color: 192 192 192 255;
+ color_class: "/fg/normal/button";
text { font: FN; size: 10;
min: 0 0;
align: 0.5 1.0;
@@ -737,7 +742,7 @@ group { name: "elm/radio/base/icon";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -749,11 +754,11 @@ group { name: "elm/radio/base/icon";
}
description { state: "selected" 0.0;
inherit: "visible" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/button";
}
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
rel1.offset: 8 8;
visible: 1;
text.min: 1 1;
@@ -763,7 +768,8 @@ group { name: "elm/radio/base/icon";
rect { "bar"; nomouse;
scale: 1;
desc { "default";
- color: 51 153 255 0;
+ color_class: "/fg/selected/button/bar";
+ color: 255 255 255 0; // no cc
fixed: 0 1;
rel.to: "base";
rel1.relative: 0.0 1.0;
@@ -773,13 +779,13 @@ group { name: "elm/radio/base/icon";
}
desc { "selected"; inherit;
min: 0 5;
- color: 51 153 255 255;
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
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/slideshow.edc
b/data/elementary/themes/edc/elm/slideshow.edc
index 5dc800e84f..3d38efc26e 100644
--- a/data/elementary/themes/edc/elm/slideshow.edc
+++ b/data/elementary/themes/edc/elm/slideshow.edc
@@ -6,7 +6,7 @@ group { name: "elm/slideshow/base/default";
parts {
part { name: "whole"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 255;
+ color: 0 0 0 255; // no cc
}
}
part { name: "image_1_whole"; type: RECT;
@@ -14,15 +14,15 @@ group { name: "elm/slideshow/base/default";
}
description { state: "fade_prev_next" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
description { state: "black_fade_prev_next_init" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "black_fade_prev_next" 0.0;
inherit: "default" 0.0;
- color: 0 0 0 255;
+ color: 0 0 0 255; // no cc
}
description { state: "horizontal_next_init" 0.0;
inherit: "default" 0.0;
@@ -58,129 +58,122 @@ group { name: "elm/slideshow/base/default";
}
description { state: "square_prev_next" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
}
part { name: "image_2_whole"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
description { state: "fade_prev_next" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "black_fade_prev_next_init" 0.0;
inherit: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
description { state: "black_fade_prev_next" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "horizontal_next_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 1.0 0.0;
rel2.relative: 2.0 1.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "horizontal_next" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "horizontal_prev_init" 0.0;
inherit: "default" 0.0;
rel1.relative: -1.0 0.0;
rel2.relative: 0.0 1.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "horizontal_prev" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "vertical_next_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 1.0;
rel2.relative: 1.0 2.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "vertical_next" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "vertical_prev_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 -1.0;
rel2.relative: 1.0 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "vertical_prev" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "square_prev_next_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "square_prev_next" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "elm.swallow.1"; type: SWALLOW;
clip_to: "image_1_whole";
description { state: "default" 0.0;
- rel1.to: "image_1_whole";
- rel2.to: "image_1_whole";
+ rel.to: "image_1_whole";
}
description { state: "not_fullscreen" 0.0;
+ rel.to: "image_1_whole";
rel1.relative: 0.1 0.1;
- rel1.to: "image_1_whole";
rel2.relative: 0.9 0.9;
- rel2.to: "image_1_whole";
}
}
part { name: "elm.swallow.2"; type: SWALLOW;
clip_to: "image_2_whole";
description {
state: "default" 0.0;
- rel1.to: "image_2_whole";
- rel2.to: "image_2_whole";
+ rel.to: "image_2_whole";
}
description { state: "not_fullscreen" 0.0;
+ rel.to: "image_2_whole";
rel1.relative: 0.1 0.1;
- rel1.to: "image_2_whole";
rel2.relative: 0.9 0.9;
- rel2.to: "image_2_whole";
}
}
part { name: "events_catcher"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
programs {
- program {
- signal: "elm,layout,fullscreen"; source: "elm";
+ program { signal: "elm,layout,fullscreen"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.1";
target: "elm.swallow.2";
transition: SINUSOIDAL 1.0;
}
- program {
- signal: "elm,layout,not_fullscreen"; source: "elm";
+ program { signal: "elm,layout,not_fullscreen"; source: "elm";
action: STATE_SET "not_fullscreen" 0.0;
target: "elm.swallow.1";
target: "elm.swallow.2";
transition: SINUSOIDAL 1.0;
}
//
- program {
- signal: "elm,fade,next"; source: "elm";
+ program { signal: "elm,fade,next"; source: "elm";
action: STATE_SET "default" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -193,8 +186,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program {
- signal: "elm,fade,previous"; source: "elm";
+ program { signal: "elm,fade,previous"; source: "elm";
action: STATE_SET "default" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -207,8 +199,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program {
- signal: "elm,black_fade,next"; source: "elm";
+ program { signal: "elm,black_fade,next"; source: "elm";
action: STATE_SET "black_fade_prev_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -226,8 +217,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 0.75;
after: "end";
}
- program {
- signal: "elm,black_fade,previous"; source: "elm";
+ program { signal: "elm,black_fade,previous"; source: "elm";
action: STATE_SET "black_fade_prev_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -245,8 +235,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 0.75;
after: "end";
}
- program {
- signal: "elm,horizontal,next"; source: "elm";
+ program { signal: "elm,horizontal,next"; source: "elm";
action: STATE_SET "horizontal_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -273,8 +262,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program {
- signal: "elm,vertical,next"; source: "elm";
+ program { signal: "elm,vertical,next"; source: "elm";
action: STATE_SET "vertical_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -287,8 +275,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program {
- signal: "elm,vertical,previous"; source: "elm";
+ program { signal: "elm,vertical,previous"; source: "elm";
action: STATE_SET "vertical_prev_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -301,8 +288,7 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program {
- signal: "elm,square,next"; source: "elm";
+ program { signal: "elm,square,next"; source: "elm";
action: STATE_SET "square_prev_next_init" 0.0;
target: "image_2_whole";
after: "square_next_2";
@@ -314,21 +300,18 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program {
- signal: "elm,square,previous"; source: "elm";
+ program { signal: "elm,square,previous"; source: "elm";
action: STATE_SET "square_prev_next_init" 0.0;
target: "image_2_whole";
after: "square_next_2";
}
- program {
- signal: "elm,none,next"; source: "elm";
+ program { signal: "elm,none,next"; source: "elm";
action: STATE_SET "fade_prev_next" 0.0;
target: "image_1_whole";
target: "image_2_whole";
after: "end";
}
- program {
- signal: "elm,none,previous"; source: "elm";
+ program { signal: "elm,none,previous"; source: "elm";
action: STATE_SET "fade_prev_next" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -337,8 +320,7 @@ group { name: "elm/slideshow/base/default";
program { name: "end";
action: SIGNAL_EMIT "elm,end" "elm";
}
- program {
- signal: "elm,anim,end"; source: "elm";
+ program { signal: "elm,anim,end"; source: "elm";
action: STATE_SET "default" 0.0;
target: "image_1_whole";
target: "image_2_whole";
diff --git a/data/elementary/themes/edc/elm/tooltip.edc
b/data/elementary/themes/edc/elm/tooltip.edc
index 1b94187443..aa989a5b0a 100644
--- a/data/elementary/themes/edc/elm/tooltip.edc
+++ b/data/elementary/themes/edc/elm/tooltip.edc
@@ -3,10 +3,10 @@ group { name: "elm/label/base/tooltip/default";
alias: "elm/label/base/tooltip/transparent";
styles {
style { name: "tooltip_style";
- base: "font="FNBD" font_size=10 color=#ffffff text_class=bubble
align=0.5";
+ base: "font="FNBD" font_size=10 color=cc:/fg/normal/tooltip/text
text_class=bubble align=0.5";
tag: "br" "\n";
- tag: "hilight" "+ font="FNBD" text_class=bubble color=#ff9933";
- tag: "b" "+ font="FNBD" text_class=bubble color=#3399ff";
+ tag: "hilight" "+ font="FNBD" text_class=bubble
color=cc:/fg/normal/toolip/text/hilight";
+ tag: "b" "+ font="FNBD" text_class=bubble";
tag: "tab" "\t";
}
}
@@ -170,7 +170,7 @@ group { name: "elm/tooltip/base/default";
rel.to: "elm.swallow.content";
rel1.offset: -10 -10;
rel2.offset: 9 9;
- color: 0 0 0 192;
+ color_class: "/dim/normal/tooltip";
offscale;
}
}
@@ -192,7 +192,7 @@ group { name: "elm/tooltip/base/default";
to: "pop"; \
} \
image.normal: "tooltip-corner-"name_"-tip.png"; \
- color: 0 0 0 192; \
+ color_class: "/dim/normal/tooltip"; \
} \
description { state: "visible" 0.0; \
inherit: "default" 0.0; \
@@ -268,7 +268,7 @@ group { name: "elm/tooltip/base/default";
align: ax 0.5; \
rel.to: "edge-drag-"name_; \
image.normal: "tooltip-edge-"name_"-tip.png"; \
- color: 0 0 0 192; \
+ color_class: "/dim/normal/tooltip"; \
} \
}
TT_EDGE_VERT("left", 0, 0, -6);
@@ -329,7 +329,7 @@ group { name: "elm/tooltip/base/default";
align: 0.5 ay; \
rel.to: "edge-drag-"name_; \
image.normal: "tooltip-edge-"name_"-tip.png"; \
- color: 0 0 0 192; \
+ color_class: "/dim/normal/tooltip"; \
} \
}
TT_EDGE_HORIZ("top", 0, 0, -6);
--
