Hi!

This patch fixes the computation of edje parts. Earlier the down right corner was at ((1.0, 1.0), (-1, -1)) and now it is at ((1.0, 1.0), (0, 0)) as it should be. E runs fine with the patch applied, but the theme is a bit screwed.

What is the purpose of adding 1? Is it so that w = 0 and h = 0 shouldn't be returned? That should be done somewhere else.

I also tried to fix the default theme for E, but I'm not sure everything is correct, and I didn't fix the ibar. Which still has to be ported to gadman anyhow.

Sebastian
Index: edje/src/lib/Edje.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.39
diff -u -b -B -r1.39 Edje.h
--- edje/src/lib/Edje.h 28 Nov 2004 14:52:01 -0000      1.39
+++ edje/src/lib/Edje.h 7 Feb 2005 09:16:35 -0000
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
 #ifndef _EDJE_H
 #define _EDJE_H
 
Index: edje/src/lib/edje_calc.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.59
diff -u -b -B -r1.59 edje_calc.c
--- edje/src/lib/edje_calc.c    7 Jan 2005 08:35:27 -0000       1.59
+++ edje/src/lib/edje_calc.c    7 Feb 2005 09:16:36 -0000
@@ -262,11 +262,11 @@
        if (rel2_to_x)
          params->w = desc->rel2.offset_x +
          rel2_to_x->x + (desc->rel2.relative_x * rel2_to_x->w) -
-         params->x + 1;
+         params->x;
        else
          params->w = desc->rel2.offset_x +
          (desc->rel2.relative_x * ed->w) -
-         params->x + 1;
+         params->x;
      }
    if (flags & FLAG_Y)
      {
@@ -279,11 +279,11 @@
        if (rel2_to_y)
          params->h = desc->rel2.offset_y +
          rel2_to_y->y + (desc->rel2.relative_y * rel2_to_y->h) -
-         params->y + 1;
+         params->y;
        else
          params->h = desc->rel2.offset_y +
          (desc->rel2.relative_y * ed->h) -
-         params->y + 1;
+         params->y;
      }
    
    /* aspect */
Index: e/data/themes/default_border.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_border.edc,v
retrieving revision 1.2
diff -u -b -B -r1.2 default_border.edc
--- e/data/themes/default_border.edc    10 Jan 2005 22:33:53 -0000      1.2
+++ e/data/themes/default_border.edc    7 Feb 2005 09:19:25 -0000
@@ -63,7 +63,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   0    5;
+              offset:   0    6;
               to_y:     "title2";
            }
            image {
@@ -85,7 +85,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "t3";
            }
            image {
@@ -106,7 +106,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    5;
+              offset:   0    6;
               to_y:     "title2";
            }
            image {
@@ -127,7 +127,7 @@
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to_y:     "b2";
            }
            image {
@@ -149,7 +149,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_border5.png";
@@ -168,7 +168,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "b2";
            }
            image {
@@ -190,7 +190,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -1;
+              offset:   4    0;
            }
            image {
               normal: "e17_border7.png";
@@ -209,7 +209,7 @@
            }
            rel2 {
               relative: 0.0  0.0;
-              offset:   3    -1;
+              offset:   4    0;
               to_y:     "b4";
            }
            image {
@@ -235,7 +235,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -2    4;
+              offset:   0    7;
               to_x:     "t3";
               to_y:     "title2";
            }
@@ -257,7 +257,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -2    4;
+              offset:   0    7;
               to_x:     "t3";
               to_y:     "title2";
            }
@@ -281,7 +281,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -300,7 +300,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -323,7 +323,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -342,7 +342,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -434,7 +434,7 @@
               to:       "title_bar";
            }
            rel2 {
-              offset:   -4  -4;
+              offset:   -3  -3;
               to:       "title_bar";
            }
            color: 255 255 255 255;
@@ -456,7 +456,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
               to:       "title_bar";
            }
            image {
@@ -488,7 +488,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   0    -4;
+              offset:   0    -3;
               to:       "title_bar";
            }
            image {
@@ -510,7 +510,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -4;
+              offset:   3    -3;
            }
         }
         description {
@@ -523,11 +523,11 @@
            align:    0.5 0.5;
            rel1 {
               relative: 1.0  0.0;
-              offset:   -4   3;
+              offset:   -3   3;
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -4   -4;
+              offset:   -3   -3;
            }
         }
         description {
@@ -540,11 +540,11 @@
            align:    0.0 0.5;
            rel1 {
               relative: 1.0  0.0;
-              offset:   -4   3;
+              offset:   -3   3;
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -4   -4;
+              offset:   -3   -3;
            }
         }
       }
@@ -564,7 +564,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
               to:       "title_bar";
            }
            image {
@@ -592,7 +592,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_0_bg";
            }
            image {
@@ -611,7 +611,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_0_bg";
            }
            image {
@@ -633,7 +633,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_1_bg";
            }
            image {
@@ -651,7 +651,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_1_bg";
            }
            image {
@@ -673,7 +673,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_2_bg";
            }
            image {
@@ -691,7 +691,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_2_bg";
            }
            image {
@@ -714,7 +714,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_0_bg";
            }
            image {
@@ -733,7 +733,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_0_bg";
            }
            image {
@@ -755,7 +755,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_1_bg";
            }
            image {
@@ -773,7 +773,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_1_bg";
            }
            image {
@@ -795,7 +795,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_2_bg";
            }
            image {
@@ -813,7 +813,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_2_bg";
            }
            image {
@@ -835,7 +835,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_0";
            }
            image {
@@ -852,7 +852,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0    0;
+              offset:   1    1;
               to:       "button_0";
            }
            image {
@@ -873,7 +873,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_1";
            }
            image {
@@ -890,7 +890,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0    0;
+              offset:   1    1;
               to:       "button_1";
            }
            image {
@@ -911,7 +911,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
               to:       "button_2";
            }
            image {
@@ -928,7 +928,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0   0;
+              offset:   1   1;
               to:       "button_2";
            }
            image {
@@ -950,7 +950,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -5    -5;
+              offset:   -4    -4;
               to:       "button_0_bg";
            }
            image {
@@ -971,7 +971,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -5    -5;
+              offset:   -4    -4;
               to:       "button_1_bg";
            }
            image {
@@ -992,7 +992,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -5    -5;
+              offset:   -4    -4;
               to:       "button_2_bg";
            }
            image {
@@ -1012,7 +1012,7 @@
            }
            rel2 {
               relative: 0.0  0.0;
-              offset:   -1   -1;
+              offset:   0   0;
               to:       "b2";
            }
            color: 0 0 0 0;
@@ -1030,7 +1030,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -2   -3;
+              offset:   -2   -2;
               to:       "t1";
            }
            color: 0 0 0 0;
@@ -1048,7 +1048,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -1;
+              offset:   4    0;
            }
            color: 0 0 0 0;
         }
@@ -1065,7 +1065,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -1081,7 +1081,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -1097,7 +1097,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   23    -1;
+              offset:   24    0;
            }
            color: 0 0 0 0;
         }
@@ -1113,7 +1113,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -1167,7 +1167,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -1;
+              offset:   3    0;
               to:      "button_0";
            }
            color: 0 0 0 0;
@@ -1188,7 +1188,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -1;
+              offset:   3    0;
               to:      "button_1";
            }
            color: 0 0 0 0;
@@ -1382,7 +1382,9 @@
         target:  "title_shadow1";
         transition: LINEAR 0.05;
         after:   "go_active3";
+        /*
         after:   "go_active3b";
+        */
       }
       program {
         name:    "go_active3";
Index: e/data/themes/default_clock.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_clock.edc,v
retrieving revision 1.2
diff -u -b -B -r1.2 default_clock.edc
Index: e/data/themes/default_gadman.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_gadman.edc,v
retrieving revision 1.4
diff -u -b -B -r1.4 default_gadman.edc
--- e/data/themes/default_gadman.edc    18 Jan 2005 15:40:51 -0000      1.4
+++ e/data/themes/default_gadman.edc    7 Feb 2005 09:19:27 -0000
@@ -29,7 +29,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   79   79;
+              offset:   80   80;
            }
         }
         description {
@@ -51,7 +51,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   79   79;
+              offset:   80   80;
            }
         }
         description {
@@ -88,7 +88,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   7    7;
+              offset:   8    8;
            }
            image {
               normal: "e17_gadman_overlay.png";
@@ -108,12 +108,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "h1";
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "h1";
            }
            image {
@@ -139,12 +139,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "h1a1";
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "h1a1";
            }
            image {
@@ -170,12 +170,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "h1a2";
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "h1a2";
            }
            image {
@@ -201,12 +201,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "h1a3";
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "h1a3";
            }
            image {
@@ -237,7 +237,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0   -1;
+              offset:   0    0;
               to: "h2";
            }
            image {
@@ -268,7 +268,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "h2a1";
            }
            image {
@@ -299,7 +299,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "h2a2";
            }
            image {
@@ -330,7 +330,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "h2a3";
            }
            image {
@@ -360,12 +360,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "v1";
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "v1";
            }
            image {
@@ -391,12 +391,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "v1a1";
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "v1a1";
            }
            image {
@@ -422,12 +422,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "v1a2";
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "v1a2";
            }
            image {
@@ -453,12 +453,12 @@
            color:    255 255 255 0;
            rel1 {
               relative: 0.0  0.0;
-              offset:   0    -1;
+              offset:   0    0;
               to: "v1a3";
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to: "v1a3";
            }
            image {
@@ -489,7 +489,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "v2";
            }
            image {
@@ -520,7 +520,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "v2a1";
            }
            image {
@@ -551,7 +551,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "v2a2";
            }
            image {
@@ -582,7 +582,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   0;
+              offset:   0    0;
               to: "v2a3";
            }
            image {
@@ -613,11 +613,11 @@
            max: 18 96;
            rel1 {
               relative: 0.0  0.0;
-              offset:   -9   0;
+              offset:   -8   0;
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -9   -1;
+              offset:   -8   0;
            }
            image {
               normal: "e17_ibar_handle_h.png";
@@ -643,7 +643,7 @@
               to: "h1";
            }
            rel2 {
-              offset:   -2    -2;
+              offset:   -1    -1;
               to: "h1";
            }
            image {
@@ -657,7 +657,7 @@
               offset:   0    0;
            }
            rel2 {
-              offset:   -1   -1;
+              offset:   0    0;
            }
         }
       }
@@ -676,7 +676,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   0    -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_ibar_handle_h.png";
@@ -702,7 +702,7 @@
               to: "h2";
            }
            rel2 {
-              offset:   -2    -2;
+              offset:   -1    -1;
               to: "h2";
            }
            image {
@@ -716,7 +716,7 @@
               offset:   0    0;
            }
            rel2 {
-              offset:   -1   -1;
+              offset:   0    0;
            }
         }
       }
@@ -731,11 +731,11 @@
            max: 96 18;
            rel1 {
               relative: 0.0  0.0;
-              offset:   0    -9;
+              offset:   0    -8;
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -9;
+              offset:   0    -8;
            }
            image {
               normal: "e17_ibar_handle_v.png";
@@ -761,7 +761,7 @@
               to: "v1";
            }
            rel2 {
-              offset:   -2    -2;
+              offset:   -1    -1;
               to: "v1";
            }
            image {
@@ -772,7 +772,7 @@
            state:    "default2" 0.0;
            inherit: "default" 0.0;
            rel1 {
-              offset:   0    0;
+              offset:   -1   -1;
            }
            rel2 {
               offset:   -1   -1;
@@ -794,7 +794,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   8;
+              offset:   0    8;
            }
            image {
               normal: "e17_ibar_handle_v.png";
@@ -820,7 +820,7 @@
               to: "v2";
            }
            rel2 {
-              offset:   -2    -2;
+              offset:   -1    -1;
               to: "v2";
            }
            image {
@@ -834,7 +834,7 @@
               offset:   0    0;
            }
            rel2 {
-              offset:   -1   -1;
+              offset:   0    0;
            }
         }
       }
Index: e/data/themes/default_ibar.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_ibar.edc,v
retrieving revision 1.2
diff -u -b -B -r1.2 default_ibar.edc
--- e/data/themes/default_ibar.edc      10 Jan 2005 22:33:53 -0000      1.2
+++ e/data/themes/default_ibar.edc      7 Feb 2005 09:19:29 -0000
@@ -40,7 +40,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
               to:       "overlay";
            }
            image {
@@ -59,7 +59,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
               to:       "overlay";
            }
            image {
@@ -100,7 +100,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -1;
+              offset:   0   0;
               to_x:     "h2";
            }
            color: 0 0 0 0;
@@ -114,7 +114,7 @@
            }
            rel2 {
               relative: 0.0  0.0;
-              offset:   -1   -1;
+              offset:   0   0;
               to_x:     "h2";
               to_y:     "h3";
            }
@@ -129,7 +129,7 @@
            }
            rel2 {
               relative: 0.0  0.0;
-              offset:   -1   -1;
+              offset:   0   0;
               to_y:     "h2";
               to_x:     "h3";
            }
@@ -145,7 +145,7 @@
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -1   -1;
+              offset:   0   0;
               to_y:     "h2";
            }
            color: 0 0 0 0;
@@ -163,7 +163,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -19  -1;
+              offset:   -18  0;
            }
            image {
               normal: "e17_ibar_over_h.png";
@@ -181,7 +181,7 @@
            }
            rel2 {
               relative: 1.0  0.0;
-              offset:   -19  -1;
+              offset:   -18  0;
               to_y:     "h3";
            }
            image {
@@ -200,7 +200,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   -1   -19;
+              offset:   0   -18;
               to_x:     "h3";
            }
            image {
@@ -220,7 +220,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -19;
+              offset:   0   -18;
            }
            image {
               normal: "e17_ibar_over_v.png";
Index: e/data/themes/default_menu.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_menu.edc,v
retrieving revision 1.2
diff -u -b -B -r1.2 default_menu.edc
--- e/data/themes/default_menu.edc      10 Jan 2005 22:33:53 -0000      1.2
+++ e/data/themes/default_menu.edc      7 Feb 2005 09:19:29 -0000
@@ -21,7 +21,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_bg.png";
@@ -41,7 +41,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -2   -2;
+              offset:   -1   -1;
            }
            color:       0 0 0 0;
         }
@@ -63,7 +63,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
            }
            image {
               normal: "e17_menu_separator.png";
@@ -88,7 +88,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
            }
         }
       }
@@ -109,7 +109,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1    -1;
+              offset:   0    0;
            }
         }
       }
@@ -133,7 +133,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -151,7 +151,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_check1.png";
@@ -172,7 +172,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_check2.png";
@@ -189,7 +189,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_check2.png";
@@ -232,7 +232,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -250,7 +250,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_radio1.png";
@@ -271,7 +271,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_radio2.png";
@@ -288,7 +288,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_menu_radio2.png";
@@ -327,7 +327,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3    -3;
+              offset:   -2   -2;
            }
         }
       }
@@ -349,7 +349,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_titlebar_outline.png";
@@ -367,7 +367,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_titlebar_outline.png";
@@ -389,7 +389,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -408,7 +408,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -431,7 +431,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -450,7 +450,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -473,7 +473,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -492,7 +492,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "title_outline";
            }
            image {
@@ -539,7 +539,7 @@
               to:       "title_bar";
            }
            rel2 {
-              offset:   -4  -4;
+              offset:   -3  -3;
               to:       "title_bar";
            }
            color: 255 255 255 255;
@@ -561,7 +561,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
               to:       "title_bar";
            }
            image {
@@ -593,7 +593,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -4;
+              offset:   3    -3;
               to:       "title_bar";
            }
            image {
@@ -615,7 +615,7 @@
            }
            rel2 {
               relative: 0.0  1.0;
-              offset:   3    -4;
+              offset:   3    -3;
            }
         }
         description {
@@ -628,11 +628,11 @@
            align:    0.5 0.5;
            rel1 {
               relative: 1.0  0.0;
-              offset:   -4   3;
+              offset:   -3   3;
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -4   -4;
+              offset:   -3   -3;
            }
         }
         description {
@@ -645,11 +645,11 @@
            align:    0.0 0.5;
            rel1 {
               relative: 1.0  0.0;
-              offset:   -4   3;
+              offset:   -3   3;
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -4   -4;
+              offset:   -3   -3;
            }
         }
       }
@@ -669,7 +669,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -3   -3;
+              offset:   -2   -2;
               to:       "title_bar";
            }
            image {
@@ -711,7 +711,9 @@
         target:  "title_shadow1";
         transition: LINEAR 0.05;
         after:   "go_active3";
+        /*
         after:   "go_active3b";
+        */
       }
       program {
         name:    "go_active3";
@@ -815,7 +817,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -834,7 +836,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
               to:       "background";
            }
            image {
Index: e/data/themes/default_pager.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_pager.edc,v
retrieving revision 1.6
diff -u -b -B -r1.6 default_pager.edc
--- e/data/themes/default_pager.edc     15 Jan 2005 14:58:26 -0000      1.6
+++ e/data/themes/default_pager.edc     7 Feb 2005 09:19:29 -0000
@@ -21,7 +21,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -37,7 +37,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_pager_screen.png";
@@ -63,7 +63,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -79,7 +79,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_pager_desk.png";
@@ -105,7 +105,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            color: 0 0 0 0;
         }
@@ -121,7 +121,7 @@
            }
            rel2 {
               relative: 1.0  1.0;
-              offset:   -1   -1;
+              offset:   0    0;
            }
            image {
               normal: "e17_pager_window.png";
@@ -144,7 +144,7 @@
            }
            rel2 {
               relative: 1.0 1.0;
-              offset:   -2  -2;
+              offset:   -1  -1;
            }
            color:       0 0 0 0;
         }

Reply via email to