Enlightenment CVS committal

Author  : dj2
Project : misc
Module  : eke

Dir     : misc/eke/data/themes/default


Modified Files:
        default.edc 


Log Message:
- stop that terrible pulsing (copied atmos' code cuz he's smart)
  - don't line up quite right, but at least it works

===================================================================
RCS file: /cvsroot/enlightenment/misc/eke/data/themes/default/default.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default.edc 29 Dec 2004 19:20:29 -0000      1.3
+++ default.edc 30 Dec 2004 02:56:34 -0000      1.4
@@ -253,142 +253,90 @@
         name, "feed.list.item";
         parts {
             part {
-                name, "title_outline";
-                mouse_events, 1; 
-                description {
-                    state, "default" 0.0;
-                    visible, 1;
-                    rel1 {
-                        relative: 0.0 0.0;
-                        offset: -1 -1;
-                    }
-                    rel2 {
-                        relative: 1.0 1.0;
-                        offset: -1 -1;
-                    }
-                    image {  
-                        normal: "e17_titlebar_outline.png";
-                        border, 8 8 8 8;
-                    }
-                    color: 255 255 255 255;
-                }  
-                description { 
-                    state, "active" 0.0;
-                    visible, 0;
-                    rel1 {      
-                        relative, 0.0 0.0;
-                        offset, -1 -1;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    image {  
-                        normal, "e17_titlebar_outline.png";
-                        border, 8 8 8 8;
-                    }
-                    color: 255 255 255 0;
-                } 
-            }     
-            part {
-                name, "title_shadow2";
+                name, "base";
+                type, IMAGE;
                 mouse_events, 0;
+
                 description {
                     state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 0.0; 
-                        offset, 0 0;
-                        to, "title_outline";
-                    }
-                    rel2 {   
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "title_outline";
-                    }
-                    image {  
-                        normal, "e17_titlebar_shadow2.png";
-                        border, 8 8 8 8;
-                    }
-                    color, 255 255 255 0;
-                }
-                description {
-                    state, "active" 0.0;
-                    visible, 1;
+                    aspect, 1.0 2.0;
+
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 0 0;
-                        to, "title_outline";
+                        offset, 1 1;
                     }
                     rel2 {
                         relative, 1.0 1.0;
                         offset, -1 -1;
-                        to, "title_outline";
                     }
                     image {
-                        normal, "e17_titlebar_shadow2.png";
-                        border, 8 8 8 8;
+                        normal, "e17_titlebar_outline.png";
+                        border, 10 10 10 10;
                     }
-                    color, 255 255 255 255;
                 }
             }
             part {
-                name, "title_shadow1";
+                name, "base_deco";
+                type, IMAGE;
                 mouse_events, 0;
                 description {
                     state, "default" 0.0;
-                    visible, 0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 0 0;
-                        to, "title_outline";
+                        offset, 5 5;
+                        to, "base";
                     }
                     rel2 {
                         relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "title_outline";
+                        offset, -5 -5;
+                        to, "base";
                     }
                     image {
-                        normal, "e17_titlebar_shadow1.png";
-                        border, 8 8 8 8;
+                        normal, "e17_reflection_shadow_overlay.png";
                     }
-                    color, 255 255 255 0;
                 }
+            }
+            part {
+                name, "label_grabber";
+                type, IMAGE;
+                mouse_events, 1;
+                repeat_events, 1;
                 description {
-                    state, "active" 0.0;
-                    visible, 1;
-                    rel1 {
+                    state, "default" 0.0;
+                    rel1 { 
                         relative, 0.0 0.0;
-                        offset, 0 0;
-                        to, "title_outline";
+                        offset, 10 0;
+                        to_x, "base";
+                        to_y, "label";
                     }
                     rel2 {
                         relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "title_outline";
+                        offset, -10 0;
+                        to_x, "base";
+                        to_y, "label";
                     }
                     image {
-                        normal, "e17_titlebar_shadow1.png";
-                        border, 8 8 8 8;
+                        normal, "e17_titlebar_outline.png";
+                        border, 10 10 10 10;
                     }
-                    color, 255 255 255 255;
+                    color, 255 255 255 192;
                 }
             }
             part {
-                name, "title_bar";
-                mouse_events, 0;
-                description {
+                name, "label_grabber_deco";
+                type, IMAGE;
+                repeat_events, 1;
+                description { 
                     state, "default" 0.0;
-                    visible, 0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 0 0;
-                        to, "title_outline";
+                        offset, 2 3;
+                        to, "label_grabber";
                     }
                     rel2 {
                         relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "title_outline";
+                        offset, -2 -2;
+                        to, "label_grabber";
                     }
                     image {
                         normal, "e17_titlebar.png";
@@ -397,49 +345,14 @@
                     color, 255 255 255 0;
                 }
                 description {
-                    state, "active" 0.0;
-                    visible, 1;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                        to, "title_outline";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "title_outline";
-                    }
-                    image {
-                        normal, "e17_titlebar.png";
-                        border, 8 8 8 8;
-                    }
+                    state, "hilited" 0.0;
+                    inherit, "default" 0.0;
                     color, 255 255 255 255;
                 }
-            }
-            part {
-                name, "label";
-                type, TEXT;
-                effect, SHADOW;
-                mouse_events, 0;
                 description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 8 6;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -8 -6;
-                    }
-                    color, 0 0 0 255;
-                    color3, 255 255 255 128;
-                    text {
-                        text, "Item Label";
-                        font, "vera";
-                        size, 10;
-                        min, 1 1;
-                        align, 0.0 0.5;
-                    }
+                    state, "down" 0.0;
+                    inherit, "default" 0.0;
+                    color, 255 255 255 128;
                 }
             }
             part {
@@ -450,11 +363,11 @@
                     state, "default" 0.0;
                     rel1 {
                         offset, 3 3;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     rel2 {
                         offset, -4 -4;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     color, 255 255 255 255;
                 }
@@ -471,12 +384,12 @@
                     rel1 {
                         relative, 0.0 0.0;
                         offset, 2 2;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     rel2 {
                         relative, 1.0 1.0;
                         offset, -3 -3;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     image {
                         normal, "e17_titlebar_glint1.png";
@@ -503,12 +416,12 @@
                     rel1 {
                         relative, 0.0 0.0;
                         offset, 3 3;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     rel2 {
                         relative, 0.0 1.0;
                         offset, 3 -4;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     image {
                         normal, "e17_titlebar_glint2.png";
@@ -520,7 +433,7 @@
                     inherit, "default" 0.0;
                     visible, 1;
                     color, 255 255 255 255;
-                    max, 169 9999;
+                    max, 169 999;
                     min, 169 8;
                     align, 0.5 0.5;
                     rel1 {
@@ -537,7 +450,7 @@
                     inherit, "default" 0.0;
                     visible, 1;
                     color, 255 255 255 128;
-                    max, 169 9999;
+                    max, 169 999;
                     min, 169 8;
                     align, 0.5 0.5;
                     rel1 {
@@ -554,7 +467,7 @@
                     inherit, "default" 0.0;
                     visible, 0;
                     color, 255 255 255 0;
-                    max, 169 9999;
+                    max, 169 999;
                     min, 169 8;
                     align, 0.0 0.5;
                     rel1 {
@@ -565,7 +478,7 @@
                         relative, 1.0 1.0;
                         offset, -4 -4;
                     }
-                } 
+                }
             }
             part {
                 name, "title_glint_3";
@@ -579,12 +492,12 @@
                     rel1 {
                         relative, 0.0 0.0;
                         offset, 2 2;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     rel2 {
                         relative, 1.0 1.0;
                         offset, -3 -3;
-                        to, "title_bar";
+                        to, "label_grabber";
                     }
                     image {
                         normal, "e17_titlebar_glint3.png";
@@ -598,43 +511,78 @@
                     color, 255 255 255 255;
                 }
             }
+            part {
+                name, "label";
+                type, TEXT;
+                effect, SHADOW;
+                mouse_events, 0;
+                description {
+                    state, "default" 0.0;
+                    rel1 {
+                        relative, 0.0 0.0;
+                        offset, 20 10;
+                        to, "base";
+                    }
+                    rel2 {
+                        relative, 1.0 0.0;
+                        offset, -10 36;
+                        to, "base";
+                    }
+                    color, 0 0 0 255;
+                    color3, 255 255 255 128;
+                    text {
+                        text, "Item Label";
+                        font, "vera";
+                        size, 10;
+                        min, 1 1;
+                        align, 0.0 0.8;
+                    }
+                }
+            }
         }
         programs {
-            program {
-                name, "go_active_pre";
-                signal, "mouse,in";
-                source, "title_outline";
-                action, STATE_SET "default" 0.0;
-                target, "title_outline";
-                target, "title_bar";
-                target, "title_shadow1";
-                target, "title_shadow2";
-                after, "go_active";
+            program {   
+                name, "label_clicked";
+                source, "label_grabber";
+                signal, "mouse,clicked,1";
+                action, SIGNAL_EMIT "eke,feed,select" "";
             }
             program {
-                name, "go_active";
-                action, STATE_SET "active" 0.0;
-                target, "title_outline";
-                target, "title_bar";
-                transition, LINEAR 0.05;
-                after, "go_active2";
+                name, "label_down";
+                source, "label_grabber";
+                signal, "mouse,down,1";
+                action, STATE_SET "down" 0.0;
+                target, "label_grabber_deco";
+                transition, ACCELERATE 0.25;
             }
-            program {
-                name, "go_active2";
-                action, STATE_SET "active" 0.0;
-                target, "title_shadow1";
-                transition, LINEAR 0.05;
-                after, "go_active3";
-                after, "go_active3b";
+            program {   
+                name, "label_up"; 
+                source, "label_grabber";
+                signal, "mouse,up,1";
+                action, STATE_SET "hilited" 0.0;
+                target, "label_grabber_deco";
+                transition, DECELERATE 0.5;
             }
-            program {
-                name, "go_active3";
-                action, STATE_SET "active" 0.0;
-                target, "title_shadow2";
-                transition, LINEAR 0.05;
+            program {   
+                name, "label_in";
+                source, "label_grabber";
+                signal, "mouse,in";
+                action, STATE_SET "hilited" 0.0;
+                target, "label_grabber_deco";
+                transition, ACCELERATE 0.5;
             }
             program {
+                name, "label_out";
+                source, "label_grabber";
+                signal, "mouse,out";
+                action, STATE_SET "default" 0.0;
+                target, "label_grabber_deco";
+                transition, DECELERATE 0.75;
+            }
+            program {   
                 name, "go_active3b";
+                signal, "mouse,in";
+                source, "label_grabber";
                 action, STATE_SET "active" 0.0;
                 target, "title_glint_1";
                 target, "title_glint_2";
@@ -676,38 +624,6 @@
                 target, "title_glint_2";
                 target, "title_glint_3";
             }
-            program {
-                name, "go_passive_pre";
-                signal, "mouse,out";
-                source, "title_outline";
-                action, STATE_SET "active" 0.0;
-                target, "title_outline";
-                target, "title_bar";
-                target, "title_shadow1";
-                target, "title_shadow2";
-                after, "go_passive";
-            }
-            program {
-                name, "go_passive";
-                action, STATE_SET "default" 0.0;
-                target, "title_shadow2";
-                transition, LINEAR 0.1;
-                after, "go_passive2";
-            }
-            program {
-                name, "go_passive2";
-                action, STATE_SET "default" 0.0;
-                target, "title_shadow1";
-                transition, LINEAR 0.1;
-                after, "go_passive3";
-            }
-            program {
-                name, "go_passive3";
-                action, STATE_SET "default" 0.0;
-                target, "title_outline";
-                target, "title_bar";
-                transition, LINEAR 0.1;
-            }
         }
     }
 




-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to