Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : apps/eclair

Dir     : e17/apps/eclair/data/widget_themes/default


Modified Files:
        default.edc menu.edc 


Log Message:
Some work on the menu widget:
* Make the menu slide when it doesn't fit in the screen
* Add the glint effect on menu items
* Fix a min_size edje problem with menu item

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/eclair/data/widget_themes/default/default.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default.edc 13 Jul 2005 22:32:31 -0000      1.1
+++ default.edc 14 Jul 2005 20:55:07 -0000      1.2
@@ -10,6 +10,9 @@
    image: "menu_item_highlight.png" COMP;
    image: "menu_item_shadow1.png" COMP;
    image: "menu_item_shadow2.png" COMP;
+   image: "menu_item_glint1.png" COMP;
+   image: "menu_item_glint2.png" COMP;
+   image: "menu_item_glint3.png" COMP;
 }
 fonts {
    font: "Vera.ttf" "Vera";
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/eclair/data/widget_themes/default/menu.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- menu.edc    13 Jul 2005 22:32:31 -0000      1.1
+++ menu.edc    14 Jul 2005 20:55:07 -0000      1.2
@@ -92,39 +92,39 @@
          name: "arrow";
          mouse_events: 0;
          description {
-            state: "visible" 0.0;
+            state: "invisible" 0.0;
+            visible: 0;
             rel1 {
-               relative: 1.0 0.5;
-               offset: -13 -6;
+               relative: 1.0 0.0;
+               offset: -1 0;
             }
             rel2 {
-               relative: 1.0 0.5;
-               offset: -1 5;
+               relative: 1.0 1.0;
+               offset: -1 -1;
             }
             image {
                normal: "menu_arrow.png";
             }
          }
          description {
-            state: "spacer" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description {
-            state: "invisible" 0.0;
-            visible: 0;
+            state: "visible" 0.0;
             rel1 {
-               relative: 1.0 0.0;
-               offset: -1 0;
+               relative: 1.0 0.5;
+               offset: -13 -6;
             }
             rel2 {
-               relative: 1.0 1.0;
-               offset: -1 -1;
+               relative: 1.0 0.5;
+               offset: -1 5;
             }
             image {
                normal: "menu_arrow.png";
             }
          }
+         description {
+            state: "spacer" 0.0;
+            inherit: "visible" 0.0;
+            visible: 0;
+         }
       }
       part {
          name: "item_outline";
@@ -249,14 +249,14 @@
             state: "default" 0.0;
             color: 0 0 0 255;
             rel1 {
-               relative: 0.0  0.0;
+               relative: 1.0  0.0;
                offset: 13 6;
-               to: "item_outline";
+               to_x: "icon";
             }
             rel2 {
-               relative: 1.0  1.0;
-               offset: -13 -6;
-               to: "item_outline";
+               relative: 0.0  1.0;
+               offset: -14 -7;
+               to_x: "arrow";
             }
             text {
                text: "label";
@@ -267,6 +267,171 @@
             }
          }
       }
+      part {
+         name: "glint_clip";
+         type: RECT;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            rel1 {
+               offset: 3 3;
+               to: "item_highlight";
+            }
+            rel2 {
+               offset: -4 -4;
+               to: "item_highlight";
+            }
+         }
+      }
+      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;
+               to: "item_highlight";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -3 -3;
+               to: "item_highlight";
+            }
+            image {
+               normal: "menu_item_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;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 3 3;
+               to: "item_highlight";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: 3 -4;
+               to: "item_highlight";
+            }
+            image {
+               normal: "menu_item_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;
+            rel1 {
+               relative: 0.0 0.0;
+               offset: 3 3;
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               offset: 3 -4;
+            }
+         }
+         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;
+               to: "item_highlight";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               offset: -3 -3;
+               to: "item_highlight";
+            }
+            image {
+               normal: "menu_item_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;
+         }
+      }
    }
    programs {
       program {
@@ -294,7 +459,7 @@
          target: "item_shadow1";
          transition: LINEAR 0.05;
          after: "go_active3";
-         //after: "go_active3b";
+         after: "go_active3b";
       }
       program {
          name: "go_active3";
@@ -302,6 +467,49 @@
          target: "item_shadow2";
          transition: LINEAR 0.05;
       }
+      program {
+         name: "go_active3b";
+         action: STATE_SET "active" 0.0;
+         target: "glint1";
+         target: "glint2";
+         transition: LINEAR 0.05;
+         after: "go_active4";
+         after: "go_active4b";
+      }
+      program {
+         name: "go_active4";
+         action: STATE_SET "active2" 0.0;
+         target: "glint2";
+         transition: LINEAR 0.2;
+         after: "go_active5";
+         after: "go_active5b";
+      }
+      program {
+         name: "go_active4b";
+         action: STATE_SET "active" 0.0;
+         target: "glint3";
+         transition: LINEAR 0.2;
+      }
+      program {
+         name: "go_active5";
+         action: STATE_SET "active3" 0.0;
+         target: "glint2";
+         transition: LINEAR 0.05;
+      }
+      program {
+         name: "go_active5b";
+         action: STATE_SET "default" 0.0;
+         target: "glint3";
+         transition: LINEAR 0.1;
+         after: "go_active6";
+      }
+      program {
+         name: "go_active6";
+         action: STATE_SET "default" 0.0;
+         target: "glint1";
+         target: "glint2";
+         target: "glint3";
+      }
 
       program {
          name: "go_passive_pre";




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to