From: Enlightenment S. <no-...@en...> - 2011-03-15 23:48:53
|
Log: dtrs-theme: fix shded border Author: jeffdameth Date: 2011-03-15 16:48:47 -0700 (Tue, 15 Mar 2011) New Revision: 57785 Trac: http://trac.enlightenment.org/e/changeset/57785 Modified: trunk/THEMES/detourious/bits/border.edc Modified: trunk/THEMES/detourious/bits/border.edc =================================================================== --- trunk/THEMES/detourious/bits/border.edc 2011-03-15 22:55:31 UTC (rev 57784) +++ trunk/THEMES/detourious/bits/border.edc 2011-03-15 23:48:47 UTC (rev 57785) @@ -346,7 +346,7 @@ #ifdef BUILD_FOR_COMPOSITE #define BORDER_DATA \ data { \ - item: "argb" "1"; \ + item: "argb" "1"; \ } #else #define BORDER_DATA \ @@ -370,7 +370,8 @@ BORDER_DATA; parts { - BORDER_IMAGE("images/window-border.png", 6 6 23 3, 25 25); + BORDER_IMAGE("images/window-border.png", 6 6 23 2, 25 25); + BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-min"); @@ -404,7 +405,7 @@ BORDER_DATA; parts { - BORDER_IMAGE("images/window-border.png", 6 6 23 3, 25 25); + BORDER_IMAGE("images/window-border.png", 6 6 23 2, 25 25); BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-close"); |
From: Enlightenment S. <no-...@en...> - 2011-03-21 11:44:18
|
Log: dtrs-theme: somehow epp ommits '-' from #defined values. fix it in theme for now Author: jeffdameth Date: 2011-03-21 04:44:11 -0700 (Mon, 21 Mar 2011) New Revision: 57931 Trac: http://trac.enlightenment.org/e/changeset/57931 Modified: trunk/THEMES/detourious/bits/border.edc Modified: trunk/THEMES/detourious/bits/border.edc =================================================================== --- trunk/THEMES/detourious/bits/border.edc 2011-03-21 09:42:11 UTC (rev 57930) +++ trunk/THEMES/detourious/bits/border.edc 2011-03-21 11:44:11 UTC (rev 57931) @@ -392,8 +392,8 @@ #define TOP 23 #define LEFT 1 -#define RIGHT -2 -#define BOTTOM -3 +#define RIGHT 2 +#define BOTTOM 3 group { @@ -409,12 +409,12 @@ BORDER_COLOR("images/window-border-color.png", 6 6 23 2, 25 25); BORDER_IMAGE("images/window-border.png", 6 6 23 2, 25 25); - BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); + BORDER_CLIENT(LEFT, -RIGHT, TOP, -BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-min"); BORDER_EVENT_MAP("e.event.titlebar", 0.0 0.0, 0 0, 1.0 0.0, -1 TOP); - BORDER_EVENT_MAP_RESIZE(LEFT, RIGHT, TOP, BOTTOM, 5); + BORDER_EVENT_MAP_RESIZE(LEFT, -RIGHT, TOP, -BOTTOM, 5); BORDER_BUTTONS("button-close", "e.event.close", 20 18, 1.0 0.0, -10 1, 1.0 0.0, -30 TOP, @@ -445,7 +445,7 @@ BORDER_SHADOW(40); BORDER_COLOR("images/window-border-color.png", 6 6 23 2, 25 25); BORDER_IMAGE("images/window-border.png", 6 6 23 2, 25 25); - BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); + BORDER_CLIENT(LEFT, -RIGHT, TOP, -BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-close"); @@ -471,8 +471,8 @@ #define TOP 22 #define LEFT 5 -#define RIGHT -6 -#define BOTTOM -6 +#define RIGHT 6 +#define BOTTOM 6 group { name: "e/widgets/border/glass/border"; @@ -492,12 +492,12 @@ BORDER_IMAGE("images/window-border-glass.png", 6 6 22 6, 28 28); - BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); + BORDER_CLIENT(LEFT, -RIGHT, TOP, -BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-min"); BORDER_EVENT_MAP("e.event.titlebar", 0.0 0.0, 0 0, 1.0 0.0, -1 TOP); - BORDER_EVENT_MAP_RESIZE(LEFT, RIGHT, TOP, BOTTOM, 5); + BORDER_EVENT_MAP_RESIZE(LEFT, -RIGHT, TOP, -BOTTOM, 5); BORDER_BUTTONS("button-close", "e.event.close", 20 18, 1.0 0.0, -10 1, 1.0 0.0, -30 TOP, |
From: Enlightenment S. <no-...@en...> - 2011-03-29 09:46:41
|
Log: dtrs-theme: revert workaround Author: jeffdameth Date: 2011-03-29 02:46:35 -0700 (Tue, 29 Mar 2011) New Revision: 58175 Trac: http://trac.enlightenment.org/e/changeset/58175 Modified: trunk/THEMES/detourious/bits/border.edc Modified: trunk/THEMES/detourious/bits/border.edc =================================================================== --- trunk/THEMES/detourious/bits/border.edc 2011-03-29 09:31:01 UTC (rev 58174) +++ trunk/THEMES/detourious/bits/border.edc 2011-03-29 09:46:35 UTC (rev 58175) @@ -392,8 +392,8 @@ #define TOP 23 #define LEFT 1 -#define RIGHT 2 -#define BOTTOM 3 +#define RIGHT -2 +#define BOTTOM -3 group { @@ -409,12 +409,12 @@ BORDER_COLOR("images/window-border-color.png", 6 6 23 2, 25 25); BORDER_IMAGE("images/window-border.png", 6 6 23 2, 25 25); - BORDER_CLIENT(LEFT, -RIGHT, TOP, -BOTTOM); + BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-min"); BORDER_EVENT_MAP("e.event.titlebar", 0.0 0.0, 0 0, 1.0 0.0, -1 TOP); - BORDER_EVENT_MAP_RESIZE(LEFT, -RIGHT, TOP, -BOTTOM, 5); + BORDER_EVENT_MAP_RESIZE(LEFT, RIGHT, TOP, BOTTOM, 5); BORDER_BUTTONS("button-close", "e.event.close", 20 18, 1.0 0.0, -10 1, 1.0 0.0, -30 TOP, @@ -445,7 +445,7 @@ BORDER_SHADOW(40); BORDER_COLOR("images/window-border-color.png", 6 6 23 2, 25 25); BORDER_IMAGE("images/window-border.png", 6 6 23 2, 25 25); - BORDER_CLIENT(LEFT, -RIGHT, TOP, -BOTTOM); + BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-close"); @@ -471,8 +471,8 @@ #define TOP 22 #define LEFT 5 -#define RIGHT 6 -#define BOTTOM 6 +#define RIGHT -6 +#define BOTTOM -6 group { name: "e/widgets/border/glass/border"; @@ -492,12 +492,12 @@ BORDER_IMAGE("images/window-border-glass.png", 6 6 22 6, 28 28); - BORDER_CLIENT(LEFT, -RIGHT, TOP, -BOTTOM); + BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); BORDER_TITLE(TOP, "e.swallow.icon", "button-min"); BORDER_EVENT_MAP("e.event.titlebar", 0.0 0.0, 0 0, 1.0 0.0, -1 TOP); - BORDER_EVENT_MAP_RESIZE(LEFT, -RIGHT, TOP, -BOTTOM, 5); + BORDER_EVENT_MAP_RESIZE(LEFT, RIGHT, TOP, BOTTOM, 5); BORDER_BUTTONS("button-close", "e.event.close", 20 18, 1.0 0.0, -10 1, 1.0 0.0, -30 TOP, |
From: Enlightenment S. <no-...@en...> - 2011-04-05 11:53:09
|
Log: themes/dtrs: do not scale bottom bg with icon size Author: jeffdameth Date: 2011-04-05 04:53:00 -0700 (Tue, 05 Apr 2011) New Revision: 58353 Trac: http://trac.enlightenment.org/e/changeset/58353 Modified: trunk/THEMES/detourious/bits/engage.edc Modified: trunk/THEMES/detourious/bits/engage.edc =================================================================== --- trunk/THEMES/detourious/bits/engage.edc 2011-04-05 11:49:45 UTC (rev 58352) +++ trunk/THEMES/detourious/bits/engage.edc 2011-04-05 11:53:00 UTC (rev 58353) @@ -88,7 +88,8 @@ description { state: "default" 0.0; - rel1.offset: -35 15; + rel1.relative: 0.0 1.0; + rel1.offset: -35 -48; rel2.offset: 34 -1; image { |
From: Enlightenment S. <no-...@en...> - 2011-04-07 13:03:51
|
Log: themes/dtrs: fix everything comp style: show again after hide Author: jeffdameth Date: 2011-04-07 06:03:43 -0700 (Thu, 07 Apr 2011) New Revision: 58441 Trac: http://trac.enlightenment.org/e/changeset/58441 Modified: trunk/THEMES/detourious/bits/comp.edc Modified: trunk/THEMES/detourious/bits/comp.edc =================================================================== --- trunk/THEMES/detourious/bits/comp.edc 2011-04-07 13:01:48 UTC (rev 58440) +++ trunk/THEMES/detourious/bits/comp.edc 2011-04-07 13:03:43 UTC (rev 58441) @@ -34,6 +34,9 @@ rel1.to: "clipper"; rel2.to: "clipper"; } + description { state: "visible" 0.0; + inherit: "default" 0.0; + } description { state: "big" 0.0; inherit: "default" 0.0; color: 255 255 255 0; @@ -131,6 +134,7 @@ action: STATE_SET "visible" 0.0; transition: DECELERATE 0.05; target: "clipper"; + target: "clipper2"; target: "shower"; after: "show2"; } @@ -148,6 +152,13 @@ after: "hide2"; } program { name: "hide2"; + action: STATE_SET "default" 0.0; + target: "clipper"; + target: "clipper2"; + target: "shower"; + after: "hide3"; + } + program { name: "hide3"; action: SIGNAL_EMIT "e,action,hide,done" "e"; } } |
From: Enlightenment S. <no-...@en...> - 2011-04-08 10:06:34
|
Log: themes/dtrs: fix image border, dont stretch hilight Author: jeffdameth Date: 2011-04-08 03:06:28 -0700 (Fri, 08 Apr 2011) New Revision: 58485 Trac: http://trac.enlightenment.org/e/changeset/58485 Modified: trunk/THEMES/detourious/bits/border.edc Modified: trunk/THEMES/detourious/bits/border.edc =================================================================== --- trunk/THEMES/detourious/bits/border.edc 2011-04-08 09:51:31 UTC (rev 58484) +++ trunk/THEMES/detourious/bits/border.edc 2011-04-08 10:06:28 UTC (rev 58485) @@ -486,7 +486,7 @@ } } - BORDER_IMAGE("images/window-border-square.png", 1 1 23 1, 25 25); + BORDER_IMAGE("images/window-border-square.png", 2 2 23 1, 25 25); BORDER_CLIENT(LEFT, RIGHT, TOP, BOTTOM); |
From: Enlightenment S. <no-...@en...> - 2011-04-08 22:03:15
|
Log: themes/dtrs: fix circular dependency Author: jeffdameth Date: 2011-04-08 15:03:09 -0700 (Fri, 08 Apr 2011) New Revision: 58497 Trac: http://trac.enlightenment.org/e/changeset/58497 Modified: trunk/THEMES/detourious/bits/everything.edc Modified: trunk/THEMES/detourious/bits/everything.edc =================================================================== --- trunk/THEMES/detourious/bits/everything.edc 2011-04-08 21:03:36 UTC (rev 58496) +++ trunk/THEMES/detourious/bits/everything.edc 2011-04-08 22:03:09 UTC (rev 58497) @@ -159,8 +159,8 @@ type: RECT; description { state: "default" 0.0; - rel1.to: "list_bg"; - rel2.to: "list_bg"; + rel1.to: "list_clip"; + rel2.to: "list_clip"; color: 245 245 245 255; } } |
From: Enlightenment S. <no-...@en...> - 2011-04-11 21:35:30
|
Log: themes/dtrs: enable mose-over animation Author: jeffdameth Date: 2011-04-11 14:35:24 -0700 (Mon, 11 Apr 2011) New Revision: 58571 Trac: http://trac.enlightenment.org/e/changeset/58571 Modified: trunk/THEMES/detourious/bits/engage.edc Modified: trunk/THEMES/detourious/bits/engage.edc =================================================================== --- trunk/THEMES/detourious/bits/engage.edc 2011-04-11 21:34:46 UTC (rev 58570) +++ trunk/THEMES/detourious/bits/engage.edc 2011-04-11 21:35:24 UTC (rev 58571) @@ -742,10 +742,9 @@ } programs { -#if HOVER_EFFECT == 1 program { name: "go_active"; - signal: "e,state,mouse,in"; + signal: "e,state,animate,in"; source: "e"; action: STATE_SET "visible" 0.0; target: "background"; @@ -760,7 +759,7 @@ } program { name: "go_passive"; - signal: "e,state,mouse,out"; + signal: "e,state,animate,out"; source: "e"; action: ACTION_STOP; target: "go_active"; @@ -772,7 +771,6 @@ action: STATE_SET "default" 0.0; target: "background"; } -#endif program { name: "go_big"; action: STATE_SET "visible" 0.0; |
From: Enlightenment S. <no-...@en...> - 2011-04-16 12:09:22
|
Log: themes/dtrs: fix engage signal names Author: jeffdameth Date: 2011-04-16 05:09:16 -0700 (Sat, 16 Apr 2011) New Revision: 58698 Trac: http://trac.enlightenment.org/e/changeset/58698 Modified: trunk/THEMES/detourious/bits/engage.edc Modified: trunk/THEMES/detourious/bits/engage.edc =================================================================== --- trunk/THEMES/detourious/bits/engage.edc 2011-04-16 09:40:42 UTC (rev 58697) +++ trunk/THEMES/detourious/bits/engage.edc 2011-04-16 12:09:16 UTC (rev 58698) @@ -589,7 +589,7 @@ /* when minimizing an application */ program { name: "go_iconic1"; - signal: "e,state,taskbar,iconic,1"; + signal: "e,state,taskbar,iconic,on"; source: "e"; action: STATE_SET "iconic" 0.0; transition: LINEAR 0.3; @@ -597,7 +597,7 @@ } program { name: "go_iconic0"; - signal: "e,state,taskbar,iconic,0"; + signal: "e,state,taskbar,iconic,off"; source: "e"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; @@ -607,7 +607,7 @@ /* when an application got focus */ program { name: "go_focused1"; - signal: "e,state,taskbar,focus,1"; + signal: "e,state,taskbar,focus,on"; source: "e"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.3; @@ -616,7 +616,7 @@ program { name: "go_focused0"; - signal: "e,state,taskbar,focus,0"; + signal: "e,state,taskbar,focus,off"; source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.3; @@ -626,7 +626,7 @@ /* application is sending urgent signal */ program { name: "go_urgent1"; - signal: "e,state,taskbar,urgent,1"; + signal: "e,state,taskbar,urgent,on"; source: "e"; action: STATE_SET "urgent" 0.0; transition: LINEAR 1.0; @@ -644,7 +644,7 @@ program { name: "go_urgent0"; - signal: "e,state,taskbar,urgent,0"; + signal: "e,state,taskbar,urgent,off"; source: "e"; action: ACTION_STOP; target: "go_urgent1"; |
From: Enlightenment S. <no-...@en...> - 2011-04-19 21:20:40
|
Log: themes/dtrs: only fade-in menus Author: jeffdameth Date: 2011-04-19 14:20:33 -0700 (Tue, 19 Apr 2011) New Revision: 58735 Trac: http://trac.enlightenment.org/e/changeset/58735 Modified: trunk/THEMES/detourious/bits/comp.edc Modified: trunk/THEMES/detourious/bits/comp.edc =================================================================== --- trunk/THEMES/detourious/bits/comp.edc 2011-04-19 20:27:34 UTC (rev 58734) +++ trunk/THEMES/detourious/bits/comp.edc 2011-04-19 21:20:33 UTC (rev 58735) @@ -176,11 +176,11 @@ color: 255 255 255 100; rel1 { relative: -1.0 -1.0; - offset: -9999 -9999; + /* offset: -9999 -9999; */ } rel2 { relative: 2.0 2.0; - offset: 9999 9999; + /* offset: 9999 9999; */ } } description { state: "visible" 0.0; @@ -298,7 +298,8 @@ } } -group { name: "e/comp/menu"; +group { + name: "e/comp/menu"; parts { part { name: "clipper"; type: RECT; @@ -308,11 +309,11 @@ color: 255 255 255 0; rel1 { relative: -1.0 -1.0; - offset: -9999 -9999; + /* offset: -9999 -9999; */ } rel2 { relative: 2.0 2.0; - offset: 9999 9999; + /* offset: 9999 9999; */ } } description { state: "visible" 0.0; @@ -347,41 +348,41 @@ visible: 0; } } - part { name: "shower"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.05 0.0; - offset: 0 0; - } - rel2 { - relative: 0.95 0.85; - offset: -1 -1; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } - } - } + /* part { name: "shower"; + * type: RECT; + * mouse_events: 0; + * description { state: "default" 0.0; + * visible: 0; + * rel1 { + * relative: 0.05 0.0; + * offset: 0 0; + * } + * rel2 { + * relative: 0.95 0.85; + * offset: -1 -1; + * } + * } + * description { state: "visible" 0.0; + * inherit: "default" 0.0; + * rel1 { + * relative: 0.0 0.0; + * } + * rel2 { + * relative: 1.0 1.0; + * } + * } + * } */ part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; mouse_events: 0; description { state: "default" 0.0; - rel1 { - to: "shower"; - } - rel2 { - to: "shower"; - } + /* rel1 { + * to: "shower"; + * } + * rel2 { + * to: "shower"; + * } */ } } } @@ -404,7 +405,7 @@ action: STATE_SET "visible" 0.0; transition: DECELERATE 0.15; target: "clipper"; - target: "shower"; + /* target: "shower"; */ after: "show2"; } program { name: "show2"; @@ -416,7 +417,7 @@ action: STATE_SET "default" 0.0; transition: DECELERATE 0.15; target: "clipper"; - target: "shower"; + /* target: "shower"; */ after: "hide2"; } program { name: "hide2"; @@ -426,6 +427,7 @@ } group { name: "e/comp/still"; + alias: "e/comp/popup"; parts { part { name: "clipper"; @@ -435,12 +437,12 @@ visible: 0; color: 255 255 255 100; rel1 { - relative: -1.0 -1.0; - offset: -9999 -9999; + /* relative: -1.0 -1.0; */ + offset: -20 -20; } rel2 { - relative: 2.0 2.0; - offset: 9999 9999; + /* relative: 2.0 2.0; */ + offset: 20 20; } } description { state: "visible" 0.0; |
From: Enlightenment S. <no-...@en...> - 2011-06-17 10:38:46
|
Log: themes/dtrs: fix shelf inset. Author: jeffdameth Date: 2011-06-17 03:38:39 -0700 (Fri, 17 Jun 2011) New Revision: 60442 Trac: http://trac.enlightenment.org/e/changeset/60442 Modified: trunk/THEMES/detourious/bits/shelf.edc Modified: trunk/THEMES/detourious/bits/shelf.edc =================================================================== --- trunk/THEMES/detourious/bits/shelf.edc 2011-06-17 10:15:27 UTC (rev 60441) +++ trunk/THEMES/detourious/bits/shelf.edc 2011-06-17 10:38:39 UTC (rev 60442) @@ -559,13 +559,13 @@ rel1 { to: "background"; relative: 0.0 0.0; - offset: 3 4; + offset: 7 5; } rel2 { to: "background"; relative: 1.0 1.0; - offset: -6 -4; + offset: -6 -5; } } } |
From: Enlightenment S. <no-...@en...> - 2011-07-27 20:37:54
|
Log: themes/dtrs: fix clip warning. efm tweaks, use glass as default Author: jeffdameth Date: 2011-07-27 13:37:48 -0700 (Wed, 27 Jul 2011) New Revision: 61823 Trac: http://trac.enlightenment.org/e/changeset/61823 Modified: trunk/THEMES/detourious/bits/border.edc trunk/THEMES/detourious/bits/efm_toolbar.edc trunk/THEMES/detourious/bits/everything.edc trunk/THEMES/detourious/bits/fileman.edc Modified: trunk/THEMES/detourious/bits/border.edc =================================================================== --- trunk/THEMES/detourious/bits/border.edc 2011-07-27 20:37:04 UTC (rev 61822) +++ trunk/THEMES/detourious/bits/border.edc 2011-07-27 20:37:48 UTC (rev 61823) @@ -526,6 +526,7 @@ group { name: "e/widgets/border/glass/border"; + alias: "e/widgets/border/internal_fileman/border"; BORDER_DATA; Modified: trunk/THEMES/detourious/bits/efm_toolbar.edc =================================================================== --- trunk/THEMES/detourious/bits/efm_toolbar.edc 2011-07-27 20:37:04 UTC (rev 61822) +++ trunk/THEMES/detourious/bits/efm_toolbar.edc 2011-07-27 20:37:48 UTC (rev 61823) @@ -10,11 +10,11 @@ description { state: "default" 0.0; - min: 0 30; - max: 9999 30; + /* min: 0 30; + * max: 9999 30; */ rel1.offset: 0 0; - rel2.offset: -1 1; - color: 180 180 180 255; + rel2.offset: -1 -1; + color: 10 10 10 255; /* image { * normal: "images/fileman_im7.png"; * border: 2 2 1 6; @@ -28,18 +28,18 @@ name: "base"; type: IMAGE; mouse_events: 0; - + description { state: "default" 0.0; - min: 0 36; - max: 9999 36; - rel1.offset: 0 1; - rel2.offset: -1 1; - + /* min: 0 38; + * max: 9999 38; */ + rel1.offset: -1 0; + rel2.offset: 0 4; image { normal: "images/fileman_im7.png"; border: 2 2 1 6; } + color: 255 255 255 200; } description { @@ -61,16 +61,16 @@ description { state: "default" 0.0; - min: 0 31; - max: 9999 31; - rel1.offset: 0 -1; - rel2.offset: -1 -3; + /* min: 0 31; + * max: 9999 31; */ + rel1.offset: 0 0; + rel2.offset: -1 -1; } description { state: "bottom" 0.0; - min: 0 31; - max: 9999 31; + /* min: 0 31; + * max: 9999 31; */ rel1.offset: 0 0; rel2.offset: -1 0; } Modified: trunk/THEMES/detourious/bits/everything.edc =================================================================== --- trunk/THEMES/detourious/bits/everything.edc 2011-07-27 20:37:04 UTC (rev 61822) +++ trunk/THEMES/detourious/bits/everything.edc 2011-07-27 20:37:48 UTC (rev 61823) @@ -874,6 +874,7 @@ parts { part { name: "clip"; + type: RECT; mouse_events: 0; description { state: "default" 0.0; Modified: trunk/THEMES/detourious/bits/fileman.edc =================================================================== --- trunk/THEMES/detourious/bits/fileman.edc 2011-07-27 20:37:04 UTC (rev 61822) +++ trunk/THEMES/detourious/bits/fileman.edc 2011-07-27 20:37:48 UTC (rev 61823) @@ -309,7 +309,8 @@ action: STATE_SET "visible" 0.0; \ target: "icon_box"; \ target: "icon_box_bg"; \ - after: "thumb_gen2"; \ + /* after: "thumb_gen2"; */ \ + after: "thumb_gen6"; \ } \ program { \ name: "thumb_gen-"; \ @@ -318,7 +319,8 @@ action: STATE_SET "default" 0.0; \ target: "icon_box"; \ target: "icon_box_bg"; \ - after: "thumb_gen2"; \ + target: "icon"; \ + /*after: "thumb_gen2";*/ \ } \ program { \ name: "thumb_gen2"; \ @@ -351,6 +353,7 @@ target: "icon"; \ } \ + #define FILEMAN_VOL_PROGS \ program { \ name: "vol_off"; \ @@ -1210,9 +1213,33 @@ } group { + name: "e/fileman/desktop/scrollframe"; + parts{ + part { + name: "e.swallow.content"; + type: SWALLOW; + + description { + state: "default" 0.0; + + rel1 { + relative: 0.0 0.0; + offset: 50 50; + } + + rel2 { + relative: 1.0 1.0; + offset: 50 50; + } + } + } + } +} + +group { name: "e/fileman/default/scrollframe"; - /* alias: "e/fileman/desktop/scrollframe"; */ + parts { part { name: "clipper"; @@ -1296,7 +1323,7 @@ description { state: "default" 0.0; - color: 231 231 232 255; + color: 211 211 212 255; rel1 { to: "sb_vbar"; } @@ -1315,7 +1342,7 @@ description { state: "default" 0.0; - color: 200 200 200 255; + color: 180 180 180 255; rel1 { to: "sb_vbar"; } |
From: Enlightenment S. <no-...@en...> - 2011-08-12 13:34:43
|
Log: themes/dtrs: fix list clip Author: jeffdameth Date: 2011-08-12 06:34:36 -0700 (Fri, 12 Aug 2011) New Revision: 62385 Trac: http://trac.enlightenment.org/e/changeset/62385 Modified: trunk/THEMES/detourious/bits/everything.edc Modified: trunk/THEMES/detourious/bits/everything.edc =================================================================== --- trunk/THEMES/detourious/bits/everything.edc 2011-08-12 13:06:08 UTC (rev 62384) +++ trunk/THEMES/detourious/bits/everything.edc 2011-08-12 13:34:36 UTC (rev 62385) @@ -836,35 +836,35 @@ target: "e.text.plugin"; target: "icon_clip"; } - /* program { - * name: "update"; - * signal: "e,signal,update"; - * source: "e"; - * action: STATE_SET "faded" 0.0; - * transition: DECELERATE 0.1; - * target: "icon_clip"; - * after: "show_icon"; - * } - * program { - * name: "show_icon"; - * action: STATE_SET "default" 0.0; - * transition: ACCELERATE 0.3; - * target: "icon_clip"; - * } - * program { - * name: "thumb_show"; - * signal: "e,action,thumb,show"; - * source: "e"; - * action: STATE_SET "faded" 0.0; - * target: "icon_clip"; - * after: "thumb_show2"; - * } - * program { - * name: "thumb_show2"; - * action: STATE_SET "default" 0.0; - * transition: SINUSOIDAL 0.2; - * target: "icon_clip"; - * } */ + program { + name: "update"; + signal: "e,signal,update"; + source: "e"; + action: STATE_SET "faded" 0.0; + transition: DECELERATE 0.1; + target: "icon_clip"; + after: "show_icon"; + } + program { + name: "show_icon"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.3; + target: "icon_clip"; + } + program { + name: "thumb_show"; + signal: "e,action,thumb,show"; + source: "e"; + action: STATE_SET "faded" 0.0; + target: "icon_clip"; + after: "thumb_show2"; + } + program { + name: "thumb_show2"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.2; + target: "icon_clip"; + } } } @@ -1447,7 +1447,7 @@ type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 255; rel1 { relative: 0.0 0.0; offset: 0 1; @@ -1457,12 +1457,6 @@ offset: -5 -3; } } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } } part { name: "clip"; @@ -1471,7 +1465,7 @@ clip_to: "base"; description { state: "default" 0.0; - color: 225 225 225 255; + color: 225 225 225 0; rel1 { to: "base"; relative: 0.0 0.0; @@ -1483,6 +1477,12 @@ offset: 40 -1; } } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } } part { name: "e.swallow.icon"; @@ -1685,14 +1685,14 @@ signal: "e,action,thumb,show_delayed"; source: "e"; action: STATE_SET "visible" 0.0; - target: "base"; + target: "clip"; } program { name: "thumb_show"; signal: "e,action,thumb,show"; source: "e"; action: STATE_SET "visible" 0.0; - target: "base"; + target: "clip"; } program { name: "detail_show"; |
From: Enlightenment S. <no-...@en...> - 2011-08-14 19:39:51
|
Log: themes/dtrs: uh that was the wrong axis. only show relexion on bottom Author: jeffdameth Date: 2011-08-14 12:39:45 -0700 (Sun, 14 Aug 2011) New Revision: 62455 Trac: http://trac.enlightenment.org/e/changeset/62455 Modified: trunk/THEMES/detourious/bits/engage.edc Modified: trunk/THEMES/detourious/bits/engage.edc =================================================================== --- trunk/THEMES/detourious/bits/engage.edc 2011-08-14 19:10:53 UTC (rev 62454) +++ trunk/THEMES/detourious/bits/engage.edc 2011-08-14 19:39:45 UTC (rev 62455) @@ -472,8 +472,223 @@ alias: "e/modules/engage/icon_top"; alias: "e/modules/engage/icon_left"; alias: "e/modules/engage/icon_right"; - alias: "e/modules/engage/icon_bottom"; + min: 32 32; + max: 128 128; + parts { + part { + name: "clip"; + type: RECT; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 128; + } + description { + state: "visible" 0.0; + color: 255 255 255 255; + } + } + part { + name: "focus_clip"; + type: RECT; + clip_to: "clip"; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + } + + description { + state: "focused" 0.0; + color: 200 200 255 255; + } + } + part { + name: "iconic_clip"; + type: RECT; + clip_to: "focus_clip"; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + } + + description { + state: "iconic" 0.0; + color: 200 200 200 255; + } + } + + part { + name: "urgent_clip"; + type: RECT; + clip_to: "iconic_clip"; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "urgent" 0.0; + color: 255 180 180 255; + } + } + + part { + name: "input_clip"; + type: RECT; + clip_to: "urgent_clip"; + mouse_events: 0; + + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "mouse_down" 0.0; + color: 200 200 200 255; + } + } + + part { + name: "e.swallow.content"; + type: SWALLOW; + clip_to: "input_clip"; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + aspect_preference: BOTH; + } + } + part { + name: "bottom_clip"; + type: RECT; + description { + state: "default" 0.0; + color: 255 255 255 100; + rel2.offset: -1 15; + } + } + } + + programs { + program { + name: "go_show"; + signal: "e,state,item,show"; + source: "e"; + action: STATE_SET "visible" 0.0; + transition: SINUSOIDAL 0.2; + target: "clip"; + } + + program { + name: "go_hide"; + signal: "e,state,item,hide"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.3; + target: "clip"; + } + + /* when minimizing an application */ + program { + name: "go_iconic1"; + signal: "e,state,taskbar,iconic,on"; + source: "e"; + action: STATE_SET "iconic" 0.0; + transition: LINEAR 0.3; + target: "iconic_clip"; + } + program { + name: "go_iconic0"; + signal: "e,state,taskbar,iconic,off"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.3; + target: "iconic_clip"; + } + + /* when an application got focus */ + program { + name: "go_focused1"; + signal: "e,state,taskbar,focus,on"; + source: "e"; + action: STATE_SET "focused" 0.0; + transition: SINUSOIDAL 0.3; + target: "focus_clip"; + } + + program { + name: "go_focused0"; + signal: "e,state,taskbar,focus,off"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.3; + target: "focus_clip"; + } + + /* application is sending urgent signal */ + program { + name: "go_urgent1"; + signal: "e,state,taskbar,urgent,on"; + source: "e"; + action: STATE_SET "urgent" 0.0; + transition: LINEAR 1.0; + target: "urgent_clip"; + after: "go_urgent2"; + } + + program { + name: "go_urgent2"; + action: STATE_SET "default" 0.0; + transition: LINEAR 1.0; + target: "urgent_clip"; + after: "go_urgent1"; + } + + program { + name: "go_urgent0"; + signal: "e,state,taskbar,urgent,off"; + source: "e"; + action: ACTION_STOP; + target: "go_urgent1"; + target: "go_urgent0"; + after: "go_urgent_end"; + } + + program { + name: "go_urgent_end"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.2; + target: "urgent_clip"; + } + + + program { + name: "go_mouse_down"; + signal: "e,state,mouse_down"; + source: "e"; + action: STATE_SET "mouse_down" 0.0; + transition: LINEAR 0.2; + target: "input_clip"; + after: "go_mouse_down2"; + } + program { + name: "go_mouse_down2"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.3; + target: "input_clip"; + } + } +} +group { + name: "e/modules/engage/icon_bottom"; + min: 32 32; max: 128 128; @@ -596,7 +811,7 @@ } map.on: 1; - map.rotation.y: 180; + map.rotation.x: 180; } } |
From: Enlightenment S. <no-...@en...> - 2011-08-14 19:45:50
|
Log: themes/dtrs: fix engage icon clip Author: jeffdameth Date: 2011-08-14 12:45:44 -0700 (Sun, 14 Aug 2011) New Revision: 62457 Trac: http://trac.enlightenment.org/e/changeset/62457 Modified: trunk/THEMES/detourious/bits/engage.edc Modified: trunk/THEMES/detourious/bits/engage.edc =================================================================== --- trunk/THEMES/detourious/bits/engage.edc 2011-08-14 19:40:39 UTC (rev 62456) +++ trunk/THEMES/detourious/bits/engage.edc 2011-08-14 19:45:44 UTC (rev 62457) @@ -565,15 +565,6 @@ aspect_preference: BOTH; } } - part { - name: "bottom_clip"; - type: RECT; - description { - state: "default" 0.0; - color: 255 255 255 100; - rel2.offset: -1 15; - } - } } programs { |
From: Enlightenment S. <no-...@en...> - 2011-08-14 20:52:25
|
Log: themes/dtrs/engage: fix center of rotation to have no flickering Author: jeffdameth Date: 2011-08-14 13:52:19 -0700 (Sun, 14 Aug 2011) New Revision: 62459 Trac: http://trac.enlightenment.org/e/changeset/62459 Modified: trunk/THEMES/detourious/bits/engage.edc Modified: trunk/THEMES/detourious/bits/engage.edc =================================================================== --- trunk/THEMES/detourious/bits/engage.edc 2011-08-14 20:50:56 UTC (rev 62458) +++ trunk/THEMES/detourious/bits/engage.edc 2011-08-14 20:52:19 UTC (rev 62459) @@ -98,7 +98,7 @@ mouse_events: 0; description { state: "default" 0.0; - } + } } } } @@ -554,7 +554,7 @@ color: 200 200 200 255; } } - + part { name: "e.swallow.content"; type: SWALLOW; @@ -762,15 +762,13 @@ color: 200 200 200 255; } } - + part { name: "e.swallow.content"; type: SWALLOW; clip_to: "input_clip"; description { state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; } } part { @@ -780,30 +778,29 @@ state: "default" 0.0; color: 255 255 255 100; rel2.offset: -1 15; - } + } } + part { + name: "bottom"; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; + } + } part { name: "proxy"; type: PROXY; clip_to: "bottom_clip"; - description { state: "default" 0.0; source: "e.swallow.content"; - - rel1{ - to: "e.swallow.content"; - relative: 0.0 1.0; - } - rel2{ - to: "e.swallow.content"; - relative: 1.0 2.0; - } - map.on: 1; + map.rotation.center: "bottom"; map.rotation.x: 180; - } } } |
From: Enlightenment S. <no-...@en...> - 2011-08-14 23:05:17
|
Log: themes/dtrs: fix text parts Author: jeffdameth Date: 2011-08-14 16:05:07 -0700 (Sun, 14 Aug 2011) New Revision: 62468 Trac: http://trac.enlightenment.org/e/changeset/62468 Modified: trunk/THEMES/detourious/bits/bluez.edc trunk/THEMES/detourious/bits/configure.edc Modified: trunk/THEMES/detourious/bits/bluez.edc =================================================================== --- trunk/THEMES/detourious/bits/bluez.edc 2011-08-14 22:55:01 UTC (rev 62467) +++ trunk/THEMES/detourious/bits/bluez.edc 2011-08-14 23:05:07 UTC (rev 62468) @@ -97,6 +97,7 @@ description { state: "default" 0.0; TEXT_COLOR align: 0.0 0.5; + fixed: 1 1; rel1 { relative: 0.0 0.0; offset: 10 0; Modified: trunk/THEMES/detourious/bits/configure.edc =================================================================== --- trunk/THEMES/detourious/bits/configure.edc 2011-08-14 22:55:01 UTC (rev 62467) +++ trunk/THEMES/detourious/bits/configure.edc 2011-08-14 23:05:07 UTC (rev 62468) @@ -58,7 +58,6 @@ description { state: "default" 0.0; min: 299 341; - rel1 { /* to: "gradient"; */ relative: 0.0 0.0; @@ -81,6 +80,7 @@ description { state: "default" 0.0; min: 299 30; + fixed: 1 1; color: 255 0 0 0; rel1 { |
From: Enlightenment S. <no-...@en...> - 2011-08-14 23:10:30
|
Log: themes/dtrs: comp: alias still as default. name wobble comp style what it is. fix indentation. Author: jeffdameth Date: 2011-08-14 16:10:22 -0700 (Sun, 14 Aug 2011) New Revision: 62469 Trac: http://trac.enlightenment.org/e/changeset/62469 Modified: trunk/THEMES/detourious/bits/bluez.edc trunk/THEMES/detourious/bits/comp.edc trunk/THEMES/detourious/bits/configure.edc Modified: trunk/THEMES/detourious/bits/bluez.edc =================================================================== --- trunk/THEMES/detourious/bits/bluez.edc 2011-08-14 23:05:07 UTC (rev 62468) +++ trunk/THEMES/detourious/bits/bluez.edc 2011-08-14 23:10:22 UTC (rev 62469) @@ -1,141 +1,141 @@ group { name: "e/modules/bluez/main"; - images { - image: "images/bluetooth.png" COMP; - image: "images/bluetooth_error.png" COMP; - image: "images/bluetooth_visible.png" COMP; - } - parts { - part { name: "eventarea"; - type: RECT; - mouse_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "bluetooth"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - min: 16 28; - max: 16 28; - image.normal: "images/bluetooth.png"; - color_class: "shelf_secondary_icon"; - } - description { state: "powered" 0.0; - inherit: "default" 0.0; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - } - description { state: "no_service" 0.0; - inherit: "default" 0.0; - image.normal: "images/bluetooth_error.png"; - } - } - part { name: "visible"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - min: 33 19; - max: 33 19; - image.normal: "images/bluetooth_visible.png"; - visible: 0; - color_class: "shelf_secondary_icon"; - } - description { state: "powered" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "no_service" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - programs { - program { - signal: "e,changed,service,none"; - source: "e"; - action: STATE_SET "no_service" 0.0; - target: "bluetooth"; - target: "visible"; - } - program { - signal: "e,changed,off"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "bluetooth"; - target: "visible"; - } - program { - signal: "e,changed,powered"; - source: "e"; - action: STATE_SET "powered" 0.0; - target: "bluetooth"; - target: "visible"; - } - program { - signal: "e,changed,hidden"; - source: "e"; - action: STATE_SET "hidden" 0.0; - target: "bluetooth"; - target: "visible"; - } - } - } + images { + image: "images/bluetooth.png" COMP; + image: "images/bluetooth_error.png" COMP; + image: "images/bluetooth_visible.png" COMP; + } + parts { + part { name: "eventarea"; + type: RECT; + mouse_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "bluetooth"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + min: 16 28; + max: 16 28; + image.normal: "images/bluetooth.png"; + color_class: "shelf_secondary_icon"; + } + description { state: "powered" 0.0; + inherit: "default" 0.0; + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + } + description { state: "no_service" 0.0; + inherit: "default" 0.0; + image.normal: "images/bluetooth_error.png"; + } + } + part { name: "visible"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + min: 33 19; + max: 33 19; + image.normal: "images/bluetooth_visible.png"; + visible: 0; + color_class: "shelf_secondary_icon"; + } + description { state: "powered" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + description { state: "no_service" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + programs { + program { + signal: "e,changed,service,none"; + source: "e"; + action: STATE_SET "no_service" 0.0; + target: "bluetooth"; + target: "visible"; + } + program { + signal: "e,changed,off"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "bluetooth"; + target: "visible"; + } + program { + signal: "e,changed,powered"; + source: "e"; + action: STATE_SET "powered" 0.0; + target: "bluetooth"; + target: "visible"; + } + program { + signal: "e,changed,hidden"; + source: "e"; + action: STATE_SET "hidden" 0.0; + target: "bluetooth"; + target: "visible"; + } + } + } } group { name: "e/modules/bluez/tip"; - min: 250 40; - parts { - part { name: "e.text.name"; - type: TEXT; - effect: SHADOW; - mouse_events: 0; - description { state: "default" 0.0; - TEXT_COLOR - align: 0.0 0.5; - fixed: 1 1; - rel1 { - relative: 0.0 0.0; - offset: 10 0; - } - rel2 { - relative: 0.0 1.0; - offset: 0 -1; - } - text { - font: FONT_BOLD; - size: 12; - min: 1 1; - align: 0.0 0.5; - } - } - } - part { name: "e.text.status"; - type: TEXT; - mouse_events: 0; - description { state: "default" 0.0; - TEXT_COLOR; - rel1 { - to: "e.text.name"; - relative: 1.0 0.0; - offset: 10 0; - } - rel2 { - to_y: "e.text.name"; - relative: 1.0 1.0; - offset: 10 -1; - } - text { - font: FONT; - size: 10; - align: 0.0 0.5; - min: 1 1; - } - } - } - } + min: 250 40; + parts { + part { name: "e.text.name"; + type: TEXT; + effect: SHADOW; + mouse_events: 0; + description { state: "default" 0.0; + TEXT_COLOR + align: 0.0 0.5; + fixed: 1 1; + rel1 { + relative: 0.0 0.0; + offset: 10 0; + } + rel2 { + relative: 0.0 1.0; + offset: 0 -1; + } + text { + font: FONT_BOLD; + size: 12; + min: 1 1; + align: 0.0 0.5; + } + } + } + part { name: "e.text.status"; + type: TEXT; + mouse_events: 0; + description { state: "default" 0.0; + TEXT_COLOR; + rel1 { + to: "e.text.name"; + relative: 1.0 0.0; + offset: 10 0; + } + rel2 { + to_y: "e.text.name"; + relative: 1.0 1.0; + offset: 10 -1; + } + text { + font: FONT; + size: 10; + align: 0.0 0.5; + min: 1 1; + } + } + } + } } Modified: trunk/THEMES/detourious/bits/comp.edc =================================================================== --- trunk/THEMES/detourious/bits/comp.edc 2011-08-14 23:05:07 UTC (rev 62468) +++ trunk/THEMES/detourious/bits/comp.edc 2011-08-14 23:10:22 UTC (rev 62469) @@ -1,181 +1,181 @@ /* exactly the same of default.edc, with larger shadow (comp-sh1.png) * and without bt_glow. */ - group { name: "e/comp/default"; - images { - image: "images/comp/comp-sh1.png" COMP; - /* image: "images/comp/bt_glow.png" COMP; */ - } - parts { - part { name: "focus-clipper"; +group { name: "e/comp/wobble"; + images { + image: "images/comp/comp-sh1.png" COMP; + /* image: "images/comp/bt_glow.png" COMP; */ + } + parts { + part { name: "focus-clipper"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color_class: "comp_focus-out_color"; - rel1 { - relative: -1.0 -1.0; - offset: -9999 -9999; - } - rel2 { - relative: 2.0 2.0; - offset: 9999 9999; - } + color_class: "comp_focus-out_color"; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } } description { state: "focused" 0.0; - inherit: "default" 0.0; - color_class: ""; - color: 255 255 255 255; + inherit: "default" 0.0; + color_class: ""; + color: 255 255 255 255; } - } - part { name: "clipper"; + } + part { name: "clipper"; type: RECT; mouse_events: 0; clip_to: "focus-clipper"; description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1 { - relative: -1.0 -1.0; - offset: -9999 -9999; - } - rel2 { - relative: 2.0 2.0; - offset: 9999 9999; - } + visible: 0; + color: 255 255 255 0; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; } - } - part { name: "shadow"; + } + part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - image { - normal: "images/comp/comp-sh1.png"; - border: 35 35 35 35; - middle: 0; - } - fill.smooth: 0; - rel1 { - to: "e.swallow.content"; - relative: 0.0 0.0; - offset: -35 -35; - } - rel2 { - to: "e.swallow.content"; - relative: 1.0 1.0; - offset: 34 34; - } + image { + normal: "images/comp/comp-sh1.png"; + border: 35 35 35 35; + middle: 0; + } + fill.smooth: 0; + rel1 { + to: "e.swallow.content"; + relative: 0.0 0.0; + offset: -35 -35; + } + rel2 { + to: "e.swallow.content"; + relative: 1.0 1.0; + offset: 34 34; + } } description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; + inherit: "default" 0.0; + visible: 0; } - } - part { name: "shower"; + } + part { name: "shower"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.05 0.05; - offset: 0 0; - } - rel2 { - relative: 0.95 0.95; - offset: -1 -1; - } + visible: 0; + rel1 { + relative: 0.05 0.05; + offset: 0 0; + } + rel2 { + relative: 0.95 0.95; + offset: -1 -1; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } + inherit: "default" 0.0; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 1.0 1.0; + } } - } - part { name: "e.swallow.content"; + } + part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; mouse_events: 0; description { state: "default" 0.0; - rel1 { - to: "shower"; - } - rel2 { - to: "shower"; - } + rel1 { + to: "shower"; + } + rel2 { + to: "shower"; + } } description { state: "focus1" 0.0; - inherit: "default" 0.0; - rel1.offset: -10 -10; - rel2.offset: 9 9; + inherit: "default" 0.0; + rel1.offset: -10 -10; + rel2.offset: 9 9; } description { state: "focus2" 0.0; - inherit: "default" 0.0; - rel1.offset: 4 4; - rel2.offset: -5 -5; + inherit: "default" 0.0; + rel1.offset: 4 4; + rel2.offset: -5 -5; } description { state: "focus3" 0.0; - inherit: "default" 0.0; - rel1.offset: -3 -3; - rel2.offset: 2 2; + inherit: "default" 0.0; + rel1.offset: -3 -3; + rel2.offset: 2 2; } description { state: "focus4" 0.0; - inherit: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + inherit: "default" 0.0; + rel1.offset: 1 1; + rel2.offset: -2 -2; } - } - /* part { name: "glow"; */ - /* mouse_events: 0; */ - /* description { state: "default" 0.0; */ - /* visible: 0; */ - /* rel1.to: "e.swallow.content"; */ - /* rel1.offset: -3 -3; */ - /* rel2.to: "e.swallow.content"; */ - /* rel2.offset: 2 2; */ - /* color: 255 255 255 0; */ - /* image { */ - /* normal: "images/comp/bt_glow.png"; */ - /* border: 8 8 8 8; */ - /* middle: 0; */ - /* } */ - /* fill.smooth: 0; */ - /* } */ - /* description { state: "active" 0.0; */ - /* inherit: "default" 0.0; */ - /* visible: 1; */ - /* color: 255 255 255 255; */ - /* } */ - /* description { state: "faded" 0.0; */ - /* inherit: "default" 0.0; */ - /* visible: 1; */ - /* color: 255 255 255 0; */ - /* rel1.offset: -23 -22; */ - /* rel2.offset: 22 22; */ - /* } */ - /* } */ - } - programs { - program { name: "shadow-on"; + } + /* part { name: "glow"; */ + /* mouse_events: 0; */ + /* description { state: "default" 0.0; */ + /* visible: 0; */ + /* rel1.to: "e.swallow.content"; */ + /* rel1.offset: -3 -3; */ + /* rel2.to: "e.swallow.content"; */ + /* rel2.offset: 2 2; */ + /* color: 255 255 255 0; */ + /* image { */ + /* normal: "images/comp/bt_glow.png"; */ + /* border: 8 8 8 8; */ + /* middle: 0; */ + /* } */ + /* fill.smooth: 0; */ + /* } */ + /* description { state: "active" 0.0; */ + /* inherit: "default" 0.0; */ + /* visible: 1; */ + /* color: 255 255 255 255; */ + /* } */ + /* description { state: "faded" 0.0; */ + /* inherit: "default" 0.0; */ + /* visible: 1; */ + /* color: 255 255 255 0; */ + /* rel1.offset: -23 -22; */ + /* rel2.offset: 22 22; */ + /* } */ + /* } */ + } + programs { + program { name: "shadow-on"; signal: "e,state,shadow,on"; source: "e"; action: STATE_SET "default" 0.0; target: "shadow"; - } - program { name: "shadow-off"; + } + program { name: "shadow-off"; signal: "e,state,shadow,off"; source: "e"; action: STATE_SET "hidden" 0.0; target: "shadow"; - } - program { name: "show1"; + } + program { name: "show1"; signal: "e,state,visible,on"; source: "e"; action: STATE_SET "visible" 0.0; @@ -183,11 +183,11 @@ target: "clipper"; target: "shower"; after: "show2"; - } - program { name: "show2"; + } + program { name: "show2"; action: SIGNAL_EMIT "e,action,show,done" "e"; - } - program { name: "hide1"; + } + program { name: "hide1"; signal: "e,state,visible,off"; source: "e"; action: STATE_SET "default" 0.0; @@ -195,302 +195,303 @@ target: "clipper"; target: "shower"; after: "hide2"; - } - program { name: "hide2"; + } + program { name: "hide2"; action: SIGNAL_EMIT "e,action,hide,done" "e"; - } - program { name: "focus"; + } + program { name: "focus"; signal: "e,state,focus,on"; source: "e"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.2; target: "focus-clipper"; - } - program { name: "unfocus"; + } + program { name: "unfocus"; signal: "e,state,focus,off"; source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.5; target: "focus-clipper"; - } - program { name: "focus1"; + } + program { name: "focus1"; signal: "e,state,focus,on"; source: "e"; action: STATE_SET "focus1" 0.0; transition: SINUSOIDAL 0.1; target: "e.swallow.content"; after: "focus2"; - } - program { name: "focus2"; + } + program { name: "focus2"; action: STATE_SET "focus2" 0.0; transition: SINUSOIDAL 0.1; target: "e.swallow.content"; after: "focus3"; - } - program { name: "focus3"; + } + program { name: "focus3"; action: STATE_SET "focus3" 0.0; transition: SINUSOIDAL 0.1; target: "e.swallow.content"; after: "focus4"; - } - program { name: "focus4"; + } + program { name: "focus4"; action: STATE_SET "focus4" 0.0; transition: SINUSOIDAL 0.1; target: "e.swallow.content"; after: "focus5"; - } - program { name: "focus5"; + } + program { name: "focus5"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.1; target: "e.swallow.content"; - } - /* program { name: "urgent-on"; */ - /* signal: "e,state,urgent,on"; */ - /* source: "e"; */ - /* action: STATE_SET "active" 0.0; */ - /* target: "glow"; */ - /* after: "urgent2"; */ - /* } */ - /* program { name: "urgent2"; */ - /* action: STATE_SET "faded" 0.0; */ - /* transition: DECELERATE 0.5; */ - /* target: "glow"; */ - /* after: "urgent-on"; */ - /* } */ - /* program { name: "urgent-off"; */ - /* signal: "e,state,urgent,off"; */ - /* source: "e"; */ - /* action: STATE_SET "default" 0.0; */ - /* target: "glow"; */ - /* } */ - } - } + } + /* program { name: "urgent-on"; */ + /* signal: "e,state,urgent,on"; */ + /* source: "e"; */ + /* action: STATE_SET "active" 0.0; */ + /* target: "glow"; */ + /* after: "urgent2"; */ + /* } */ + /* program { name: "urgent2"; */ + /* action: STATE_SET "faded" 0.0; */ + /* transition: DECELERATE 0.5; */ + /* target: "glow"; */ + /* after: "urgent-on"; */ + /* } */ + /* program { name: "urgent-off"; */ + /* signal: "e,state,urgent,off"; */ + /* source: "e"; */ + /* action: STATE_SET "default" 0.0; */ + /* target: "glow"; */ + /* } */ + } +} //---- - group { name: "e/comp/none"; - parts { - part { name: "e.swallow.content"; +group { name: "e/comp/none"; + parts { + part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; } - } - } - programs { - program { name: "show1"; + } + } + programs { + program { name: "show1"; signal: "e,state,visible,on"; source: "e"; action: SIGNAL_EMIT "e,action,show,done" "e"; - } - program { name: "hide1"; + } + program { name: "hide1"; signal: "e,state,visible,off"; source: "e"; action: SIGNAL_EMIT "e,action,hide,done" "e"; - } - } - } + } + } +} //---- - group { name: "e/comp/still"; - images { - image: "images/comp/comp-sh1.png" COMP; - } - parts { - part { name: "shadow"; +group { name: "e/comp/default"; + alias: "e/comp/still"; + images { + image: "images/comp/comp-sh1.png" COMP; + } + parts { + part { name: "shadow"; mouse_events: 0; description { state: "default" 0.0; - image { - normal: "images/comp/comp-sh1.png"; - border: 35 35 35 35; - middle: 0; - } - fill.smooth: 0; - rel1 { - to: "e.swallow.content"; - relative: 0.0 0.0; - offset: -35 -35; - } - rel2 { - to: "e.swallow.content"; - relative: 1.0 1.0; - offset: 34 34; - } + image { + normal: "images/comp/comp-sh1.png"; + border: 35 35 35 35; + middle: 0; + } + fill.smooth: 0; + rel1 { + to: "e.swallow.content"; + relative: 0.0 0.0; + offset: -35 -35; + } + rel2 { + to: "e.swallow.content"; + relative: 1.0 1.0; + offset: 34 34; + } } description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; + inherit: "default" 0.0; + visible: 0; } - } - part { name: "focus-clipper"; + } + part { name: "focus-clipper"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color_class: "comp_focus-out_color"; - rel1 { - relative: -1.0 -1.0; - offset: -9999 -9999; - } - rel2 { - relative: 2.0 2.0; - offset: 9999 9999; - } + color_class: "comp_focus-out_color"; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } } description { state: "focused" 0.0; - inherit: "default" 0.0; - color_class: ""; - color: 255 255 255 255; + inherit: "default" 0.0; + color_class: ""; + color: 255 255 255 255; } - } - part { name: "e.swallow.content"; + } + part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "focus-clipper"; description { state: "default" 0.0; } - } - } - programs { - program { name: "shadow-on"; + } + } + programs { + program { name: "shadow-on"; signal: "e,state,shadow,on"; source: "e"; action: STATE_SET "default" 0.0; target: "shadow"; - } - program { name: "shadow-off"; + } + program { name: "shadow-off"; signal: "e,state,shadow,off"; source: "e"; action: STATE_SET "hidden" 0.0; target: "shadow"; - } - program { name: "show1"; + } + program { name: "show1"; signal: "e,state,visible,on"; source: "e"; action: SIGNAL_EMIT "e,action,show,done" "e"; - } - program { name: "hide1"; + } + program { name: "hide1"; signal: "e,state,visible,off"; source: "e"; action: SIGNAL_EMIT "e,action,hide,done" "e"; - } - program { name: "focus"; + } + program { name: "focus"; signal: "e,state,focus,on"; source: "e"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.2; target: "focus-clipper"; - } - program { name: "unfocus"; + } + program { name: "unfocus"; signal: "e,state,focus,off"; source: "e"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.5; target: "focus-clipper"; - } - } - } + } + } +} //---- - group { name: "e/comp/popup"; - images { - image: "images/comp/comp-sh1.png" COMP; - } - parts { - part { name: "clipper"; +group { name: "e/comp/popup"; + images { + image: "images/comp/comp-sh1.png" COMP; + } + parts { + part { name: "clipper"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1 { - relative: -1.0 -1.0; - offset: -9999 -9999; - } - rel2 { - relative: 2.0 2.0; - offset: 9999 9999; - } + visible: 0; + color: 255 255 255 0; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; } - } - part { name: "shadow"; + } + part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - image { - normal: "images/comp/comp-sh1.png"; - border: 35 35 35 35; - middle: 0; - } - fill.smooth: 0; - rel1 { - to: "e.swallow.content"; - relative: 0.0 0.0; - offset: -35 -35; - } - rel2 { - to: "e.swallow.content"; - relative: 1.0 1.0; - offset: 34 34; - } + image { + normal: "images/comp/comp-sh1.png"; + border: 35 35 35 35; + middle: 0; + } + fill.smooth: 0; + rel1 { + to: "e.swallow.content"; + relative: 0.0 0.0; + offset: -35 -35; + } + rel2 { + to: "e.swallow.content"; + relative: 1.0 1.0; + offset: 34 34; + } } description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; + inherit: "default" 0.0; + visible: 0; } - } - part { name: "shower"; + } + part { name: "shower"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.05 0.05; - offset: 0 0; - } - rel2 { - relative: 0.95 0.95; - offset: -1 -1; - } + visible: 0; + rel1 { + relative: 0.05 0.05; + offset: 0 0; + } + rel2 { + relative: 0.95 0.95; + offset: -1 -1; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } + inherit: "default" 0.0; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 1.0 1.0; + } } - } - part { name: "e.swallow.content"; + } + part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; mouse_events: 0; description { state: "default" 0.0; - rel1 { - to: "shower"; - } - rel2 { - to: "shower"; - } + rel1 { + to: "shower"; + } + rel2 { + to: "shower"; + } } - } - } - programs { - program { name: "shadow-on"; + } + } + programs { + program { name: "shadow-on"; signal: "e,state,shadow,on"; source: "e"; action: STATE_SET "default" 0.0; target: "shadow"; - } - program { name: "shadow-off"; + } + program { name: "shadow-off"; signal: "e,state,shadow,off"; source: "e"; action: STATE_SET "hidden" 0.0; target: "shadow"; - } - program { name: "show1"; + } + program { name: "show1"; signal: "e,state,visible,on"; source: "e"; action: STATE_SET "visible" 0.0; @@ -498,11 +499,11 @@ target: "clipper"; target: "shower"; after: "show2"; - } - program { name: "show2"; + } + program { name: "show2"; action: SIGNAL_EMIT "e,action,show,done" "e"; - } - program { name: "hide1"; + } + program { name: "hide1"; signal: "e,state,visible,off"; source: "e"; action: STATE_SET "default" 0.0; @@ -510,117 +511,117 @@ target: "clipper"; target: "shower"; after: "hide2"; - } - program { name: "hide2"; + } + program { name: "hide2"; action: SIGNAL_EMIT "e,action,hide,done" "e"; - } - } - } + } + } +} //---- - group { name: "e/comp/menu"; - images { - image: "images/comp/comp-sh1.png" COMP; - } - parts { - part { name: "clipper"; +group { name: "e/comp/menu"; + images { + image: "images/comp/comp-sh1.png" COMP; + } + parts { + part { name: "clipper"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1 { - relative: -1.0 -1.0; - offset: -9999 -9999; - } - rel2 { - relative: 2.0 2.0; - offset: 9999 9999; - } + visible: 0; + color: 255 255 255 0; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; } - } - part { name: "shadow"; + } + part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - image { - normal: "images/comp/comp-sh1.png"; - border: 35 35 35 35; - middle: 0; - } - fill.smooth: 0; - rel1 { - to: "e.swallow.content"; - relative: 0.0 0.0; - offset: -35 -35; - } - rel2 { - to: "e.swallow.content"; - relative: 1.0 1.0; - offset: 34 34; - } + image { + normal: "images/comp/comp-sh1.png"; + border: 35 35 35 35; + middle: 0; + } + fill.smooth: 0; + rel1 { + to: "e.swallow.content"; + relative: 0.0 0.0; + offset: -35 -35; + } + rel2 { + to: "e.swallow.content"; + relative: 1.0 1.0; + offset: 34 34; + } } description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; + inherit: "default" 0.0; + visible: 0; } - } - part { name: "shower"; + } + part { name: "shower"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.1 0.0; - offset: 0 0; - } - rel2 { - relative: 0.9 0.8; - offset: -1 -1; - } + visible: 0; + rel1 { + relative: 0.1 0.0; + offset: 0 0; + } + rel2 { + relative: 0.9 0.8; + offset: -1 -1; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } + inherit: "default" 0.0; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 1.0 1.0; + } } - } - part { name: "e.swallow.content"; + } + part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; mouse_events: 0; description { state: "default" 0.0; - rel1 { - to: "shower"; - } - rel2 { - to: "shower"; - } + rel1 { + to: "shower"; + } + rel2 { + to: "shower"; + } } - } - } - programs { - program { name: "shadow-on"; + } + } + programs { + program { name: "shadow-on"; signal: "e,state,shadow,on"; source: "e"; action: STATE_SET "default" 0.0; target: "shadow"; - } - program { name: "shadow-off"; + } + program { name: "shadow-off"; signal: "e,state,shadow,off"; source: "e"; action: STATE_SET "hidden" 0.0; target: "shadow"; - } - program { name: "show1"; + } + program { name: "show1"; signal: "e,state,visible,on"; source: "e"; action: STATE_SET "visible" 0.0; @@ -628,11 +629,11 @@ target: "clipper"; target: "shower"; after: "show2"; - } - program { name: "show2"; + } + program { name: "show2"; action: SIGNAL_EMIT "e,action,show,done" "e"; - } - program { name: "hide1"; + } + program { name: "hide1"; signal: "e,state,visible,off"; source: "e"; action: STATE_SET "default" 0.0; @@ -640,9 +641,9 @@ target: "clipper"; target: "shower"; after: "hide2"; - } - program { name: "hide2"; + } + program { name: "hide2"; action: SIGNAL_EMIT "e,action,hide,done" "e"; - } - } - } + } + } +} Modified: trunk/THEMES/detourious/bits/configure.edc =================================================================== --- trunk/THEMES/detourious/bits/configure.edc 2011-08-14 23:05:07 UTC (rev 62468) +++ trunk/THEMES/detourious/bits/configure.edc 2011-08-14 23:10:22 UTC (rev 62469) @@ -5,36 +5,6 @@ //max: 299 341; parts { - /* part { - * name: "bg_border"; - * type: RECT; - * mouse_events: 0; - * - * description { - * state: "default" 0.0; - * color: 104 108 111 255; - * } - * } */ - - /* MENU_GRADIENT */ - - /* part { - * name: "bg_overlay"; - * type: IMAGE; - * mouse_events: 0; - * - * description { - * state: "default" 0.0; - * rel1.offset: 0 0; - * rel2.offset: -1 -1; - * - * image { - * normal: "images/menu_im0.png"; - * border: 2 2 2 2; - * middle: 1; - * } - * } - * } */ part { name: "dialog_bg"; type: IMAGE; |
From: Enlightenment S. <no-...@en...> - 2011-08-15 00:14:33
|
Log: themes/dtrs: add comp style for evry and comp-scale win to match shadows Author: jeffdameth Date: 2011-08-14 17:14:26 -0700 (Sun, 14 Aug 2011) New Revision: 62472 Trac: http://trac.enlightenment.org/e/changeset/62472 Modified: trunk/THEMES/detourious/bits/comp.edc Modified: trunk/THEMES/detourious/bits/comp.edc =================================================================== --- trunk/THEMES/detourious/bits/comp.edc 2011-08-14 23:56:22 UTC (rev 62471) +++ trunk/THEMES/detourious/bits/comp.edc 2011-08-15 00:14:26 UTC (rev 62472) @@ -2,10 +2,6 @@ * and without bt_glow. */ group { name: "e/comp/wobble"; - images { - image: "images/comp/comp-sh1.png" COMP; - /* image: "images/comp/bt_glow.png" COMP; */ - } parts { part { name: "focus-clipper"; type: RECT; @@ -291,9 +287,6 @@ //---- group { name: "e/comp/default"; alias: "e/comp/still"; - images { - image: "images/comp/comp-sh1.png" COMP; - } parts { part { name: "shadow"; mouse_events: 0; @@ -389,9 +382,6 @@ } //---- group { name: "e/comp/popup"; - images { - image: "images/comp/comp-sh1.png" COMP; - } parts { part { name: "clipper"; type: RECT; @@ -519,9 +509,6 @@ } //---- group { name: "e/comp/menu"; - images { - image: "images/comp/comp-sh1.png" COMP; - } parts { part { name: "clipper"; type: RECT; @@ -647,3 +634,358 @@ } } } +group { name: "e/comp/everything"; + parts { + part { name: "clipper"; + type: RECT; + mouse_events: 0; + clip_to: "clipper2"; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + description { state: "big" 0.0; + inherit: "default" 0.0; + color: 255 255 255 0; + } + } + part { name: "clipper2"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 255; + rel1.to: "clipper"; + rel2.to: "clipper"; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + } + description { state: "big" 0.0; + inherit: "default" 0.0; + color: 255 255 255 0; + } + } + part { name: "shadow"; + mouse_events: 0; + clip_to: "clipper"; + description { state: "default" 0.0; + image { + normal: "images/comp/comp-sh1.png"; + border: 35 35 35 35; + middle: 0; + } + fill.smooth: 0; + rel1 { + to: "e.swallow.content"; + relative: 0.0 0.0; + offset: -35 -35; + } + rel2 { + to: "e.swallow.content"; + relative: 1.0 1.0; + offset: 34 34; + } + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "shower"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + visible: 0; + rel1 { + relative: 0.05 0.05; + offset: 0 0; + } + rel2 { + relative: 0.95 0.95; + offset: -1 -1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 1.0 1.0; + } + } + description { state: "big" 0.0; + inherit: "default" 0.0; + rel1 { + relative: -0.3 -0.3; + } + rel2 { + relative: 1.3 1.3; + } + } + } + part { name: "e.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { + to: "shower"; + } + rel2 { + to: "shower"; + } + } + } + } + programs { + program { name: "shadow-on"; + signal: "e,state,shadow,on"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "shadow"; + } + program { name: "shadow-off"; + signal: "e,state,shadow,off"; + source: "e"; + action: STATE_SET "hidden" 0.0; + target: "shadow"; + } + program { name: "show1"; + signal: "e,state,visible,on"; + source: "e"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.05; + target: "clipper"; + target: "clipper2"; + target: "shower"; + after: "show2"; + } + program { name: "show2"; + action: SIGNAL_EMIT "e,action,show,done" "e"; + } + program { name: "hide1"; + signal: "e,state,visible,off"; + source: "e"; + action: STATE_SET "big" 0.0; + transition: ACCELERATE 0.25; + target: "clipper"; + target: "clipper2"; + target: "shower"; + after: "hide2"; + } + program { name: "hide2"; + action: STATE_SET "default" 0.0; + target: "clipper"; + target: "clipper2"; + target: "shower"; + after: "hide3"; + } + program { name: "hide3"; + action: SIGNAL_EMIT "e,action,hide,done" "e"; + } + } +} + +/* comp-scale has to recreate to border shadow as we cant get it from comp */ +group { + name: "modules/scale/win"; + + parts { + part { name: "clipper"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 255 255 255 255; + rel1 { + relative: -1.0 -1.0; + offset: -9999 -9999; + } + rel2 { + relative: 2.0 2.0; + offset: 9999 9999; + } + } + description { state: "faded" 0.0; + inherit: "default" 0.0; + color: 200 200 200 235; + } + } + part { name: "shadow"; + mouse_events: 0; + clip_to: "clipper"; + description { state: "default" 0.0; + image { + normal: "images/comp/comp-sh1.png"; + border: 35 35 35 35; + middle: 0; + } + fill { + smooth: 0; + } + rel1 { + to: "e.swallow.win"; + relative: 0.0 0.0; + offset: -35 -35; + } + rel2 { + to: "e.swallow.win"; + relative: 1.0 1.0; + offset: 34 34; + } + } + } + + part { + name: "e.swallow.win"; + type: SWALLOW; + clip_to: "clipper"; + /* mouse_events: 0; */ + description { + state: "default" 0.0; + color: 255 255 255 255; + } + } + + part { + name: "text.clipper"; + type: RECT; + description { + state: "default" 0.0; + rel1 { + to: "e.swallow.win"; + offset: 10 0; + } + rel2 { + to: "e.swallow.win"; + offset: -10 -1; + } + color: 255 255 255 0; + visible: 0; + } + description { + state: "show" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + visible: 0; + } + } + + part { + name: "text_bg"; + mouse_events: 0; + clip_to: "text.clipper"; + description { + state: "default" 0.0; + min: 60 22; + max: 9999 22; + color: 255 255 255 192; + rel1 { + to: "e.text.label"; + relative: 0.0 0.0; + offset: -10 0; + } + rel2 { + to: "e.text.label"; + relative: 1.0 1.0; + offset: 10 -1; + } + image { + normal: "images/itask_im4.png"; + border: 5 5 5 5; + } + } + } + part { + name: "e.text.label"; + type: TEXT; + mouse_events: 0; + clip_to: "text.clipper"; + description { + state: "default" 0.0; + visible: 0; + rel1 { + to: "e.swallow.win"; + offset: 25 0; + } + rel2 { + to: "e.swallow.win"; + offset: -25 -1; + } + text { + font: "Sans:style=Bold"; + size: 7; + align: 0.5 0.5; + elipsis: 1.0; + /* min: 0 1; */ + max: 1 0; + text: ""; + text_class: "border_title_active"; + } + } + } + } + programs { + program { + name: "mouse_in"; + signal: "mouse,in"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.4; + target: "clipper"; + } + program { + name: "mouse_out"; + signal: "mouse,out"; + source: "e"; + action: STATE_SET "faded" 0.0; + transition: SINUSOIDAL 0.4; + target: "clipper"; + } + program { + name: "mouse_in2"; + signal: "mouse,in"; + source: "e"; + action: STATE_SET "show" 0.0; + transition: SINUSOIDAL 0.5; + target: "text.clipper"; + } + program { + name: "mouse_out2"; + signal: "mouse,out"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.5; + target: "text.clipper"; + } + program { + name: "hide"; + signal: "hide"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.2; + target: "clipper"; + } + program { + name: "show"; + signal: "show"; + source: "e"; + action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.2; + target: "text.clipper"; + } + } +} |
From: Enlightenment S. <no-...@en...> - 2011-08-19 22:26:00
|
Log: themes/dtrs/evry: fix label pos Author: jeffdameth Date: 2011-08-19 15:25:54 -0700 (Fri, 19 Aug 2011) New Revision: 62601 Trac: http://trac.enlightenment.org/e/changeset/62601 Modified: trunk/THEMES/detourious/bits/everything.edc Modified: trunk/THEMES/detourious/bits/everything.edc =================================================================== --- trunk/THEMES/detourious/bits/everything.edc 2011-08-19 22:14:07 UTC (rev 62600) +++ trunk/THEMES/detourious/bits/everything.edc 2011-08-19 22:25:54 UTC (rev 62601) @@ -1358,7 +1358,7 @@ #else TEXT_COLOR; #endif - TEXT_NORMAL("label_normal", 0.5 1.0, 0 1); + TEXT_NORMAL("label_normal", 0.5 0.5, 0 1); } description { state: "selected" 0.0; |
From: Enlightenment S. <no-...@en...> - 2011-08-19 22:56:36
|
Log: themes/dtrs: fix Author: jeffdameth Date: 2011-08-19 15:56:30 -0700 (Fri, 19 Aug 2011) New Revision: 62604 Trac: http://trac.enlightenment.org/e/changeset/62604 Modified: trunk/THEMES/detourious/bits/border.edc Modified: trunk/THEMES/detourious/bits/border.edc =================================================================== --- trunk/THEMES/detourious/bits/border.edc 2011-08-19 22:53:04 UTC (rev 62603) +++ trunk/THEMES/detourious/bits/border.edc 2011-08-19 22:56:30 UTC (rev 62604) @@ -378,7 +378,7 @@ } -#if BUILD_FOR_COMPOSITE +#if BUILD_COMPOSITE #define BORDER_DATA \ data { \ item: "argb" "1"; \ |
From: Enlightenment S. <no-...@en...> - 2011-08-20 01:21:04
|
Log: themes/dtrs: increase slider dragable size to make it usable for touchscreen Author: jeffdameth Date: 2011-08-19 18:20:56 -0700 (Fri, 19 Aug 2011) New Revision: 62606 Trac: http://trac.enlightenment.org/e/changeset/62606 Modified: trunk/THEMES/detourious/bits/slider.edc Modified: trunk/THEMES/detourious/bits/slider.edc =================================================================== --- trunk/THEMES/detourious/bits/slider.edc 2011-08-20 01:02:43 UTC (rev 62605) +++ trunk/THEMES/detourious/bits/slider.edc 2011-08-20 01:20:56 UTC (rev 62606) @@ -7,32 +7,22 @@ name: "base"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 157 57 11 0; - - rel1 { - offset: 2 2; - } - - rel2 { - offset: -7 -3; - } + rel1.offset: 2 2; + rel2.offset: -7 -3; } - description { state: "active" 0.0; color: 157 57 11 0; - - rel1 { - offset: 2 -1; + rel1 { + offset: 2 -1; } - - rel2 { - to_x: "label_under"; - relative: 0.0 1.0; - offset: -6 -3; + rel2 { + to_x: "label_under"; + relative: 0.0 1.0; + offset: -6 -3; } } } @@ -42,28 +32,19 @@ type: IMAGE; mouse_events: 0; clip_to: "clip"; - description { state: "default" 0.0; max: 99999 16; min: 40 16; - - rel1 { - to: "base"; - offset: 6 -1; - } - - rel2 { - to: "base"; - offset: -5 -2; - } - + rel1.to: "base"; + rel1.offset: 6 -1; + rel2.to: "base"; + rel2.offset: -5 -2; image { normal: "images/runner_im0.png"; border: 6 6 0 0; } } - description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -75,43 +56,32 @@ name: "label_under"; type: IMAGE; mouse_events: 0; - description { state: "default" 0.0; min: 40 24; max: 9999 24; visible: 0; fixed: 1 0; - image { normal: "images/entry_im0.png"; border: 6 6 8 7; } - - fill { - smooth: 1; - } } - description { state: "active" 0.0; min: 40 24; - /* align: 0.0 1.0; */ fixed: 1 0; - rel1 { to: "e.text.label"; relative: 0.0 0.0; offset: -11 -4; } - rel2 { to: "e.text.label"; relative: 1.0 1.0; offset: 9 1; } - image { normal: "images/entry_im0.png"; border: 6 6 8 7; @@ -123,34 +93,26 @@ name: "label_focus"; type: IMAGE; mouse_events: 0; - description { state: "default" 0.0; min: 22 24; visible: 0; - align: 0.0 0.5; + align: 0.0 0.5; rel1 { to: "e.text.label"; relative: 0.0 0.0; offset: -11 -4; } - rel2 { to: "e.text.label"; relative: 1.0 1.0; offset: 9 5; } - image { normal: "images/entry_im1.png"; border: 7 7 8 7; } - - fill { - smooth: 1; - } } - description { state: "active" 0.0; inherit: "default" 0.0; @@ -163,25 +125,21 @@ type: TEXT; mouse_events: 0; clip_to: "clip"; - description { state: "default" 0.0; visible: 0; fixed: 1 0; } - description { state: "active" 0.0; - align: 1.0 0.5; + align: 1.0 0.5; fixed: 1 0; min: 30 10; TEXT_COLOR; - rel1 { relative: 1.0 0.0; offset: -8 7; } - rel2 { relative: 1.0 1.0; offset: -8 -8; @@ -195,15 +153,13 @@ name: "slider_p1"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 18 119 186 0; - - rel2 { - to: "e.dragable.slider"; - relative: 0.0 1.0; - offset: -1 -1; + rel2 { + to: "e.dragable.slider"; + relative: 0.0 1.0; + offset: -1 -1; } } } @@ -212,15 +168,13 @@ name: "slider_p2"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 231 93 7 0; - - rel2 { - to: "e.dragable.slider"; - relative: 1.0 0.0; - offset: 0 0; + rel2 { + to: "e.dragable.slider"; + relative: 1.0 0.0; + offset: 0 0; } } } @@ -229,21 +183,18 @@ name: "confine_area"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - max: 99999 16; + max: 99999 40; fixed: 1 1; color: 255 0 0 0; - - rel1 { - to: "base"; - offset: 1 0; + rel1 { + to: "base"; + offset: 1 0; } - - rel2 { - to: "base"; - offset: -1 -1; + rel2 { + to: "base"; + offset: -1 -1; } } } @@ -252,30 +203,26 @@ name: "e.dragable.slider"; type: RECT; mouse_events: 1; - dragable { x: 1 1 0; y: 0 0 0; confine: "confine_area"; } - description { state: "default" 0.0; - min: 29 17; - max: 29 17; + min: 29 40; + max: 29 40; fixed: 1 1; color: 255 0 0 0; - - rel1 { - to: "base"; - relative: 0.5 0.5; - offset: 0 0; + rel1 { + to: "base"; + relative: 0.5 0.5; + offset: 0 0; } - - rel2 { - to: "base"; - relative: 0.5 0.5; - offset: 0 0; + rel2 { + to: "base"; + relative: 0.5 0.5; + offset: 0 0; } } } @@ -284,18 +231,15 @@ name: "shadow_focus_clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; color: 255 255 255 128; } - description { state: "focused" 0.0; inherit: "default" 0.0; color: 255 255 255 64; } - description { state: "disabled" 0.0; inherit: "focused" 0.0; @@ -307,28 +251,20 @@ type: IMAGE; mouse_events: 0; clip_to: "shadow_focus_clip"; - description { state: "default" 0.0; - - rel1 { - to: "slider_image"; - offset: 1 -1; + rel1 { + to: "slider_image"; + offset: 1 -1; } - - rel2 { - to: "slider_image"; - offset: -2 -1; + rel2 { + to: "slider_image"; + offset: -2 -1; } - image { normal: "images/slider_im1.png"; border: 7 8 7 7; } - - fill { - smooth: 1; - } } } @@ -337,32 +273,20 @@ type: IMAGE; mouse_events: 0; //clip_to: "clip"; - description { state: "default" 0.0; min: 29 17; max: 29 17; fixed: 1 1; - - rel1 { - to: "e.dragable.slider"; - } - - rel2 { - to: "e.dragable.slider"; - } - - image { - normal: "images/slider_im0.png"; - } + rel1.to: "e.dragable.slider"; + rel2.to: "e.dragable.slider"; + image.normal: "images/slider_im0.png"; } - description { state: "clicked" 0.0; inherit: "default" 0.0; color: 235 235 235 255; } - description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -373,11 +297,9 @@ name: "clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; } - description { state: "disabled" 0.0; color: 255 255 255 128; @@ -388,13 +310,11 @@ name: "catch"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; visible: 0; color: 0 0 0 0; } - description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -408,12 +328,12 @@ # undef PROG # endif #define PROG(NAME,SIGNAL,SRC,ACT,TARGET) \ - program { \ - name: NAME; \ - signal: SIGNAL; \ - source: SRC; \ - action: ACT; \ - target: TARGET; \ + program { \ + name: NAME; \ + signal: SIGNAL; \ + source: SRC; \ + action: ACT; \ + target: TARGET; \ } PROG("slider-", "mouse,down,1", "slider_p1", DRAG_VAL_PAGE -1.0 0.0, "e.dragable.slider"); @@ -423,13 +343,13 @@ # undef PROG # endif #define PROG(NAME,SIGNAL,SRC,ACT,TARGET) \ - program { \ - name: NAME; \ - signal: SIGNAL; \ - source: SRC; \ - action: STATE_SET ACT 0.0; \ - transition: DECELERATE 0.25; \ - target: TARGET; \ + program { \ + name: NAME; \ + signal: SIGNAL; \ + source: SRC; \ + action: STATE_SET ACT 0.0; \ + transition: DECELERATE 0.25; \ + target: TARGET; \ } PROG("up", "mouse,up,1", "e.dragable.slider", "default", "slider_image"); @@ -439,14 +359,14 @@ # undef PROG # endif #define PROG(NAME,SIGNAL,SRC,ACT,TARGET1,TARGET2,TARGET3) \ - program { \ - name: NAME; \ - signal: SIGNAL; \ - source: SRC; \ - action: STATE_SET ACT 0.0; \ - target: TARGET1; \ - target: TARGET2; \ - target: TARGET3; \ + program { \ + name: NAME; \ + signal: SIGNAL; \ + source: SRC; \ + action: STATE_SET ACT 0.0; \ + target: TARGET1; \ + target: TARGET2; \ + target: TARGET3; \ } PROG("show_label", "e,action,show,label", "e", "active", "base", "label_under", "e.text.label"); @@ -502,32 +422,28 @@ name: "base"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 255 0 0 0; min: 32 10; - rel1 { - offset: 0 0; + rel1 { + offset: 0 0; } - - rel2 { - offset: -1 -1; + rel2 { + offset: -1 -1; } } - description { state: "active" 0.0; color: 255 0 0 0; min: 32 10; - rel1 { - offset: 2 2; + rel1 { + offset: 2 2; } - - rel2 { - to_y: "label_under"; - relative: 1.0 0.0; - offset: -3 -1; + rel2 { + to_y: "label_under"; + relative: 1.0 0.0; + offset: -3 -1; } } } @@ -537,28 +453,23 @@ type: IMAGE; mouse_events: 0; clip_to: "clip"; - description { state: "default" 0.0; max: 16 99999; min: 16 40; - - rel1 { - to: "base"; - offset: -1 11; + rel1 { + to: "base"; + offset: -1 11; } - - rel2 { - to: "base"; - offset: -2 -10; + rel2 { + to: "base"; + offset: -2 -10; } - image { normal: "images/runner_im1.png"; border: 0 0 6 6; } } - description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -570,41 +481,31 @@ name: "label_under"; type: IMAGE; mouse_events: 0; - description { state: "default" 0.0; min: 30 24; max: 9999 24; visible: 0; - image { normal: "images/entry_im0.png"; border: 6 6 8 7; } - - fill { - smooth: 1; - } } - description { state: "active" 0.0; min: 30 24; max: 9999 24; visible: 1; - - rel1 { - to: "e.text.label"; - relative: 0.0 0.0; - offset: -7 -4; + rel1 { + to: "e.text.label"; + relative: 0.0 0.0; + offset: -7 -4; } - - rel2 { - to: "e.text.label"; - relative: 1.0 1.0; - offset: 3 3; + rel2 { + to: "e.text.label"; + relative: 1.0 1.0; + offset: 3 3; } - image { normal: "images/entry_im0.png"; border: 6 6 8 7; @@ -616,35 +517,26 @@ name: "label_focus"; type: IMAGE; mouse_events: 0; - description { state: "default" 0.0; min: 27 24; max: 9999 24; visible: 0; - - rel1 { - to: "e.text.label"; - relative: 0.0 0.0; - offset: -7 -4; + rel1 { + to: "e.text.label"; + relative: 0.0 0.0; + offset: -7 -4; } - - rel2 { - to: "e.text.label"; - relative: 1.0 1.0; - offset: 3 3; + rel2 { + to: "e.text.label"; + relative: 1.0 1.0; + offset: 3 3; } - image { normal: "images/entry_im1.png"; border: 7 7 8 7; } - - fill { - smooth: 1; - } } - description { state: "active" 0.0; inherit: "default" 0.0; @@ -657,28 +549,23 @@ type: TEXT; mouse_events: 0; clip_to: "clip"; - description { state: "default" 0.0; fixed: 1 1; visible: 0; } - description { state: "active" 0.0; align: 0.5 1.0; TEXT_COLOR; - - rel1 { - relative: 0.0 1.0; - offset: 7 -8; + rel1 { + relative: 0.0 1.0; + offset: 7 -8; } - - rel2 { - relative: 1.0 1.0; - offset: -8 -8; + rel2 { + relative: 1.0 1.0; + offset: -8 -8; } - TEXT_NORMAL("slider", 0.5 0.5, 1 1); } } @@ -687,15 +574,13 @@ name: "slider_p1"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 18 119 186 0; - - rel2 { - to: "e.dragable.slider"; - relative: 1.0 0.0; - offset: -1 -1; + rel2 { + to: "e.dragable.slider"; + relative: 1.0 0.0; + offset: -1 -1; } } } @@ -704,15 +589,13 @@ name: "slider_p2"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 231 93 7 0; - - rel1 { - to: "e.dragable.slider"; - relative: 0.0 1.0; - offset: 0 0; + rel1 { + to: "e.dragable.slider"; + relative: 0.0 1.0; + offset: 0 0; } } } @@ -721,21 +604,18 @@ name: "confine_area"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - max: 16 99999; + max: 40 99999; fixed: 1 1; color: 0 0 0 0; - - rel1 { - to: "base"; - offset: 0 6; + rel1 { + to: "base"; + offset: 0 6; } - - rel2 { - to: "base"; - offset: -1 -5; + rel2 { + to: "base"; + offset: -1 -5; } } } @@ -744,30 +624,26 @@ name: "e.dragable.slider"; type: RECT; mouse_events: 1; - dragable { x: 0 0 0; y: -1 1 0; confine: "confine_area"; } - description { state: "default" 0.0; - min: 17 29; - max: 17 29; + min: 40 29; + max: 40 29; fixed: 1 1; color: 0 0 0 0; - - rel1 { - to: "base"; - relative: 0.5 0.5; - offset: 1 0; + rel1 { + to: "base"; + relative: 0.5 0.5; + offset: 1 0; } - - rel2 { - to: "base"; - relative: 0.5 0.5; - offset: 1 0; + rel2 { + to: "base"; + relative: 0.5 0.5; + offset: 1 0; } } } @@ -776,18 +652,15 @@ name: "shadow_focus_clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; color: 255 255 255 128; } - description { state: "focused" 0.0; inherit: "default" 0.0; color: 255 255 255 64; } - description { state: "disabled" 0.0; inherit: "focused" 0.0; @@ -799,62 +672,44 @@ type: IMAGE; mouse_events: 0; clip_to: "shadow_focus_clip"; - description { state: "default" 0.0; - - rel1 { - to: "slider_image"; - offset: 0 1; + rel1 { + to: "slider_image"; + offset: 0 1; } - - rel2 { - to: "slider_image"; - offset: -1 0; + rel2 { + to: "slider_image"; + offset: -1 0; } - image { normal: "images/slider_im3.png"; border: 7 7 7 7; } - - fill { - smooth: 1; - } } } - + part { name: "slider_image"; type: IMAGE; mouse_events: 0; //clip_to: "clip"; - description { state: "default" 0.0; min: 17 29; max: 17 29; fixed: 1 1; - - rel1 { - to: "e.dragable.slider"; - } - - rel2 { - to: "e.dragable.slider"; - } - + rel1.to: "e.dragable.slider"; + rel2.to: "e.dragable.slider"; image { normal: "images/slider_im2.png"; } } - description { state: "clicked" 0.0; inherit: "default" 0.0; color: 235 235 235 255; } - description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -864,12 +719,10 @@ part { name: "clip"; type: RECT; - description { state: "default" 0.0; color: 255 255 255 255; } - description { state: "disabled" 0.0; color: 255 255 255 128; @@ -880,13 +733,11 @@ name: "catch"; type: RECT; mouse_events: 1; - description { state: "default" 0.0; color: 0 0 0 0; visible: 0; } - description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -895,17 +746,17 @@ } } - programs { + programs { # ifdef PROG # undef PROG # endif #define PROG(NAME,SIGNAL,SRC,ACT,TARGET) \ - program { \ - name: NAME; \ - signal: SIGNAL; \ - source: SRC; \ - action: ACT; \ - target: TARGET; \ + program { \ + name: NAME; \ + signal: SIGNAL; \ + source: SRC; \ + action: ACT; \ + target: TARGET; \ } PROG("slider-", "mouse,down,1", "slider_p1", DRAG_VAL_PAGE 0.0 -1.0, "e.dragable.slider"); @@ -915,13 +766,13 @@ # undef PROG # endif #define PROG(NAME,SIGNAL,SRC,ACT,TARGET) \ - program { \ - name: NAME; \ - signal: SIGNAL; \ - source: SRC; \ - action: STATE_SET ACT 0.0; \ - transition: DECELERATE 0.25; \ - target: TARGET; \ + program { \ + name: NAME; \ + signal: SIGNAL; \ + source: SRC; \ + action: STATE_SET ACT 0.0; \ + transition: DECELERATE 0.25; \ + target: TARGET; \ } PROG("up", "mouse,up,1", "e.dragable.slider", "default", "slider_image"); @@ -931,14 +782,14 @@ # undef PROG # endif #define PROG(NAME,SIGNAL,SRC,ACT,TARGET1,TARGET2,TARGET3) \ - program { \ - name: NAME; \ - signal: SIGNAL; \ - source: SRC; \ - action: STATE_SET ACT 0.0; \ - target: TARGET1; \ - target: TARGET2; \ - target: TARGET3; \ + program { \ + name: NAME; \ + signal: SIGNAL; \ + source: SRC; \ + action: STATE_SET ACT 0.0; \ + target: TARGET1; \ + target: TARGET2; \ + target: TARGET3; \ } PROG("show_label", "e,action,show,label", "e", "active", "base", "label_under", "e.text.label"); |
From: Enlightenment S. <no-...@en...> - 2011-08-20 01:27:56
|
Log: themes/dtrs/evry: decrase illume icon size Author: jeffdameth Date: 2011-08-19 18:27:49 -0700 (Fri, 19 Aug 2011) New Revision: 62607 Trac: http://trac.enlightenment.org/e/changeset/62607 Modified: trunk/THEMES/detourious/bits/everything.edc Modified: trunk/THEMES/detourious/bits/everything.edc =================================================================== --- trunk/THEMES/detourious/bits/everything.edc 2011-08-20 01:20:56 UTC (rev 62606) +++ trunk/THEMES/detourious/bits/everything.edc 2011-08-20 01:27:49 UTC (rev 62607) @@ -1154,8 +1154,7 @@ group { name: "e/modules/everything/thumbview/item/thumb"; #if BUILD_ILLUME - min: 148 140; - /* min: 128 128; */ + min: 128 128; #endif parts { part { @@ -1271,10 +1270,6 @@ state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; -#if BUILD_ILLUME - min: 128 128; - max: 128 128; -#endif rel1 { to: "base"; } |
From: Enlightenment S. <no-...@en...> - 2011-08-21 13:54:00
|
Log: themes/dtrs/evry: tweak slide anim Author: jeffdameth Date: 2011-08-21 06:53:52 -0700 (Sun, 21 Aug 2011) New Revision: 62660 Trac: http://trac.enlightenment.org/e/changeset/62660 Modified: trunk/THEMES/detourious/bits/everything.edc Modified: trunk/THEMES/detourious/bits/everything.edc =================================================================== --- trunk/THEMES/detourious/bits/everything.edc 2011-08-21 12:47:11 UTC (rev 62659) +++ trunk/THEMES/detourious/bits/everything.edc 2011-08-21 13:53:52 UTC (rev 62660) @@ -224,8 +224,14 @@ map.smooth: 0; } description { + state: "transition" 0.7; + inherit: "transition" 0.0; + visible: 0; + } + description { state: "transition" 1.0; inherit: "transition" 0.0; + visible: 0; } description { state: "default" 1.0; @@ -246,16 +252,22 @@ } description { state: "transition" 0.0; - visible: 1; rel1.to: "list_clip"; rel2.to: "list_clip"; map.on: 1; map.perspective: "blub2"; map.smooth: 0; + visible: 0; } description { + state: "transition" 0.3; + inherit: "transition" 0.0; + visible: 1; + } + description { state: "transition" 1.0; inherit: "transition" 0.0; + visible: 1; } description { state: "default" 1.0; @@ -455,6 +467,8 @@ name: "slide_left2"; action: STATE_SET "transition" 1.0; transition: TRANSITION; + target: "e.swallow.list"; + target: "e.swallow.list2"; target: "blub"; target: "blub2"; after: "slide_left3"; @@ -462,11 +476,8 @@ program { name: "slide_left3"; action: STATE_SET "default" 1.0; - /* transition: LINEAR 0.1; */ target: "e.swallow.list"; target: "e.swallow.list2"; - /* target: "blub"; - * target: "blub2"; */ after: "left_end"; } program { name: "left_end"; @@ -487,6 +498,8 @@ name: "slide_right2"; action: STATE_SET "transition" 0.0; transition: TRANSITION; + target: "e.swallow.list"; + target: "e.swallow.list2"; target: "blub"; target: "blub2"; after: "slide_right3"; @@ -494,11 +507,8 @@ program { name: "slide_right3"; action: STATE_SET "default" 0.0; - /* transition: LINEAR 0.1; */ target: "e.swallow.list"; target: "e.swallow.list2"; - /* target: "blub"; - * target: "blub2"; */ after: "right_end"; } program { name: "right_end"; |
From: Enlightenment S. <no-...@en...> - 2011-08-22 09:40:43
|
Log: themes/dtrs: add illume keyboard Author: jeffdameth Date: 2011-08-22 02:40:36 -0700 (Mon, 22 Aug 2011) New Revision: 62685 Trac: http://trac.enlightenment.org/e/changeset/62685 Added: trunk/THEMES/detourious/bits/illume_kbd.edc |