From: Enlightenment C. <no...@cv...> - 2006-08-29 12:20:48
|
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Modified Files: button.edc Log Message: * Put the "glint" effect into a macro. For now, only "button" uses this macro =================================================================== RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/button.edc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- button.edc 14 Feb 2006 02:28:02 -0000 1.8 +++ button.edc 29 Aug 2006 12:20:45 -0000 1.9 @@ -1,9 +1,6 @@ group { name: "button"; min: 0 32; - data { - item: "inset" "8 8 8 8"; - } parts { part { name: "button"; @@ -49,158 +46,7 @@ } } } - part { - name: "glint_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - } - part { - name: "glint1"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 0.0 0.0; - max: 34 13; - rel1 { - relative: 0.0 0.0; - offset: 2 2; - } - rel2 { - relative: 1.0 1.0; - offset: -3 -3; - } - image { - normal: "glint1.png"; - border: 5 0 5 0; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { - name: "glint2"; - mouse_events: 0; - clip_to: "glint_clip"; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 1.0 0.5; - max: 0 0; - fixed: 1 1; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 0.0 1.0; - offset: 3 -4; - } - image { - normal: "glint2.png"; - border: 0 0 5 5; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - max: 169 9999; - min: 169 8; - align: 0.5 0.5; - } - description { - state: "active2" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 128; - max: 169 9999; - min: 169 8; - align: 0.5 0.5; - rel1 { - relative: 1.0 0.0; - offset: -4 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - description { - state: "active3" 0.0; - inherit: "default" 0.0; - visible: 0; - color: 255 255 255 0; - max: 169 9999; - min: 169 8; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: -4 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - } - part { - name: "glint3"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 1.0 1.0; - max: 34 13; - rel1 { - relative: 0.0 0.0; - offset: 2 2; - } - rel2 { - relative: 1.0 1.0; - offset: -3 -3; - } - image { - normal: "glint3.png"; - border: 0 5 0 5; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } + GLINT_PART("button") FOCUS_GLOW(0.0, 0.0, 0, 0, "button", 1.0, 1.0, -1, -1, "button") DRAG_GLOW(0.0, 0.0, 0, 0, "button", 1.0, 1.0, -1, -1, "button") } @@ -223,16 +69,14 @@ name: "button_enter"; signal: "enter"; source: ""; - script { - run_program(PROGRAM:"go_active"); - } + GLINT_ACTION } program { name: "button_focus"; signal: "focus"; source: ""; + GLINT_ACTION after: "button_focus_prog"; - after: "go_active"; } program { name: "button_focus_prog"; @@ -263,48 +107,6 @@ source: ""; DRAG_LEAVE_ACTION } - program { - name: "go_active"; - action: STATE_SET "active" 0.0; - target: "glint1"; - target: "glint2"; - transition: LINEAR 0.05; - after: "go_active2"; - after: "go_active2b"; - } - program { - name: "go_active2"; - action: STATE_SET "active2" 0.0; - target: "glint2"; - transition: LINEAR 0.2; - after: "go_active3"; - after: "go_active3b"; - } - program { - name: "go_active2b"; - action: STATE_SET "active" 0.0; - target: "glint3"; - transition: LINEAR 0.2; - } - program { - name: "go_active3"; - action: STATE_SET "active3" 0.0; - target: "glint2"; - transition: LINEAR 0.05; - } - program { - name: "go_active3b"; - action: STATE_SET "default" 0.0; - target: "glint3"; - transition: LINEAR 0.1; - after: "go_active4"; - } - program { - name: "go_active4"; - action: STATE_SET "default" 0.0; - target: "glint1"; - target: "glint2"; - target: "glint3"; - } + GLINT_PROGRAM } } |