Enlightenment CVS committal

Author  : handyande
Project : e17
Module  : apps/e

Dir     : e17/apps/e/data/themes


Modified Files:
        default_border.edc 


Log Message:
tidy edc and make parts more consistent
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_border.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default_border.edc  16 Mar 2005 23:20:12 -0000      1.3
+++ default_border.edc  17 Mar 2005 13:56:19 -0000      1.4
@@ -1,4 +1,4 @@
-#define BUTTON(NAME, TYPE, REL1X, REL1Y, OFF1X, OFF1Y, TO1, REL2X, REL2Y, 
OFF2X, OFF2Y, TO2) \
+#define BORDER_BUTTON(NAME, TYPE, REL1X, REL1Y, OFF1X, OFF1Y, TO1, REL2X, 
REL2Y, OFF2X, OFF2Y, TO2) \
       part { \
         name:          NAME"_shadow2"; \
         mouse_events:  0; \
@@ -164,6 +164,30 @@
         } \
       }
 
+#define FULL_SIZE_BORDER_BUTTON(TYPE) \
+group { \
+   name:  "widgets/border/default/"TYPE; \
+   parts { \
+      part { \
+        name:           "whole"; \
+        type:           RECT; \
+        description { \
+           state: "default" 0.0; \
+           visible: 0; \
+           rel1 { \
+              relative: 0.0 0.0; \
+              offset:   0   0; \
+           } \
+           rel2 { \
+              relative: 1.0 1.0; \
+              offset:   -1  -1; \
+           } \
+        } \
+      } \
+      BORDER_BUTTON("button", TYPE, 0.0, 0.0, -3, -3, "whole", 1.0, 1.0, 2, 2, 
"whole") \
+   } \
+}
+
 images {
    image: "e17_border1.png" COMP;
    image: "e17_border2.png" COMP;
@@ -882,9 +906,9 @@
         }
       }
 
-      BUTTON("button_0", "close", 0.0, 0.0, 0, 0, "whole", 1.0, 0.0, -1, 23, 
"whole")
-      BUTTON("button_1", "maximize", 0.0, 0.0, 3, 0, "button_0", 0.0, 1.0, 3, 
-1, "button_0")
-      BUTTON("button_2", "minimize", 0.0, 0.0, 3, 0, "button_1", 0.0, 1.0, 3, 
-1, "button_1")
+      BORDER_BUTTON("button_0", "close", 0.0, 0.0, 0, 0, "whole", 1.0, 0.0, 
-1, 23, "whole")
+      BORDER_BUTTON("button_1", "maximize", 0.0, 0.0, 3, 0, "button_0", 0.0, 
1.0, 3, -1, "button_0")
+      BORDER_BUTTON("button_2", "minimize", 0.0, 0.0, 3, 0, "button_1", 0.0, 
1.0, 3, -1, "button_1")
 
       part {
         name:          "icon";
@@ -1382,120 +1406,9 @@
    }
 }
 
-group {
-   name: "widgets/border/default/close";
-   parts {
-      part {
-        name:           "whole";
-        type:           RECT;
-        description {
-           state: "default" 0.0;
-           visible: 0;
-           rel1 {
-              relative: 0.0 0.0;
-              offset:   0   0;
-           }
-           rel2 {
-              relative: 1.0 1.0;
-              offset:   -1  -1;
-           }
-        }
-      }
-      BUTTON("button_0", "close", 0.0, 0.0, -3, -3, "whole", 1.0, 1.0, 2, 2, 
"whole")
-   }
-}
-
-group {
-   name:  "widgets/border/default/iconify";
-   parts {
-      part {
-        name:           "whole";
-        type:           RECT;
-        description {
-           state: "default" 0.0;
-           visible: 0;
-           rel1 {
-              relative: 0.0 0.0;
-              offset:   0   0;
-           }
-           rel2 {
-              relative: 1.0 1.0;
-              offset:   -1  -1;
-           }
-        }
-      }
-      BUTTON("button_1", "minimize", 0.0, 0.0, -3, -3, "whole", 1.0, 1.0, 2, 
2, "whole")
-   }
-}
-
-group {
-   name:  "widgets/border/default/maximize";
-   parts {
-      part {
-        name:           "whole";
-        type:           RECT;
-        description {
-           state: "default" 0.0;
-           visible: 0;
-           rel1 {
-              relative: 0.0 0.0;
-              offset:   0   0;
-           }
-           rel2 {
-              relative: 1.0 1.0;
-              offset:   -1  -1;
-           }
-        }
-      }
-
-      BUTTON("button_2", "maximize", 0.0, 0.0, -3, -3, "whole", 1.0, 1.0, 2, 
2, "whole")
-   }
-}
-
-group {
-   name:  "widgets/border/default/shade";
-   parts {
-      part {
-        name:           "whole";
-        type:           RECT;
-        description {
-           state: "default" 0.0;
-           visible: 0;
-           rel1 {
-              relative: 0.0 0.0;
-              offset:   0   0;
-           }
-           rel2 {
-              relative: 1.0 1.0;
-              offset:   -1  -1;
-           }
-        }
-      }
-
-      BUTTON("button_3", "shade", 0.0, 0.0, -3, -3, "whole", 1.0, 1.0, 2, 2, 
"whole")
-   }
-}
-
-group {
-   name:  "widgets/border/default/stick";
-   parts {
-      part {
-        name:           "whole";
-        type:           RECT;
-        description {
-           state: "default" 0.0;
-           visible: 0;
-           rel1 {
-              relative: 0.0 0.0;
-              offset:   0   0;
-           }
-           rel2 {
-              relative: 1.0 1.0;
-              offset:   -1  -1;
-           }
-        }
-      }
+FULL_SIZE_BORDER_BUTTON("close")
+FULL_SIZE_BORDER_BUTTON("minimize")
+FULL_SIZE_BORDER_BUTTON("maximize")
+FULL_SIZE_BORDER_BUTTON("shade")
+FULL_SIZE_BORDER_BUTTON("stick")
 
-      BUTTON("button_2", "stick", 0.0, 0.0, -3, -3, "whole", 1.0, 1.0, 2, 2, 
"whole")
-   }
-}




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to