Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_gadman.c e_gadman.h 


Log Message:
gadman padding.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_gadman.c  19 Sep 2005 04:28:22 -0000      1.46
+++ e_gadman.c  23 Sep 2005 23:40:45 -0000      1.47
@@ -16,6 +16,9 @@
    struct {
       int x, y, w, h;
    } pos;
+   struct {
+      int l, r, t, b;
+   } pad;
    int w, h;
    int edge;
    int zone;
@@ -91,6 +94,10 @@
    E_CONFIG_VAL(D, T, pos.y, INT);
    E_CONFIG_VAL(D, T, pos.w, INT);
    E_CONFIG_VAL(D, T, pos.h, INT);
+   E_CONFIG_VAL(D, T, pad.l, INT);
+   E_CONFIG_VAL(D, T, pad.r, INT);
+   E_CONFIG_VAL(D, T, pad.t, INT);
+   E_CONFIG_VAL(D, T, pad.b, INT);
    E_CONFIG_VAL(D, T, w, INT);
    E_CONFIG_VAL(D, T, h, INT);
    E_CONFIG_VAL(D, T, edge, INT);
@@ -297,19 +304,27 @@
        E_CONFIG_LIMIT(cf->pos.y, 0, 10000);
        E_CONFIG_LIMIT(cf->pos.w, 1, 10000);
        E_CONFIG_LIMIT(cf->pos.h, 1, 10000);
+       E_CONFIG_LIMIT(cf->pad.l, 0, 1000);
+       E_CONFIG_LIMIT(cf->pad.r, 0, 1000);
+       E_CONFIG_LIMIT(cf->pad.t, 0, 1000);
+       E_CONFIG_LIMIT(cf->pad.b, 0, 1000);
        E_CONFIG_LIMIT(cf->w, 0, 10000);
        E_CONFIG_LIMIT(cf->h, 0, 10000);
        E_CONFIG_LIMIT(cf->edge, E_GADMAN_EDGE_LEFT, E_GADMAN_EDGE_BOTTOM);
        if (cf->pos.w != cf->w)
-         gmc->ax = (double)(cf->pos.x - cf->w) / (double)(cf->pos.w - cf->w);
+         gmc->ax = (double)(cf->pos.x) / (double)(cf->pos.w - cf->w);
        else
          gmc->ax = 0.0;
        if (cf->pos.h != cf->h)
-         gmc->ay = (double)(cf->pos.y - cf->h) / (double)(cf->pos.h - cf->h);
+         gmc->ay = (double)(cf->pos.y) / (double)(cf->pos.h - cf->h);
        else
          gmc->ay = 0.0;
        gmc->w = cf->w;
+       gmc->w -= (cf->pad.l + cf->pad.r);
+       gmc->w += (gmc->pad.l + gmc->pad.r);
        gmc->h = cf->h;
+       gmc->h -= (cf->pad.t + cf->pad.b);
+       gmc->h += (gmc->pad.t + gmc->pad.b);
        gmc->edge = cf->edge;
        gmc->use_autow = cf->use_autow;
        gmc->use_autoh = cf->use_autoh;
@@ -330,11 +345,11 @@
 //     gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
 //     gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
        if (cf->pos.w != cf->w)
-         gmc->x = gmc->zone->x + ((cf->pos.x * (gmc->zone->w - gmc->w)) / 
(cf->pos.w - gmc->w));
+         gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
        else
          gmc->x = gmc->zone->x;
        if (cf->pos.h != cf->h)
-         gmc->y = gmc->zone->y + ((cf->pos.y * (gmc->zone->h - gmc->h)) / 
(cf->pos.h - gmc->h));
+         gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) *  gmc->ay);
        else
          gmc->y = gmc->zone->y;
        gmc->config = cf;
@@ -476,6 +491,17 @@
 }
 
 void
+e_gadman_client_padding_set(E_Gadman_Client *gmc, int l, int r, int t, int b)
+{
+   E_OBJECT_CHECK(gmc);
+   E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
+   gmc->pad.l = l;
+   gmc->pad.r = r;
+   gmc->pad.t = t;
+   gmc->pad.b = b;
+}
+
+void
 e_gadman_client_auto_size_set(E_Gadman_Client *gmc, Evas_Coord autow, 
Evas_Coord autoh)
 {
    E_OBJECT_CHECK(gmc);
@@ -1069,30 +1095,33 @@
    double aspect;
    int change = 0;
    
+   neww = gmc->w - (gmc->pad.l + gmc->pad.r);
+   newh = gmc->h - (gmc->pad.t + gmc->pad.b);
    if (gmc->h > 0)
-     aspect = (double)gmc->w / (double) gmc->h;
+     aspect = (double)neww / (double)newh;
    else
      aspect = 0.0;
-   neww = gmc->w;
-   newh = gmc->h;
+
    if (aspect > gmc->maxa)
      {
        if (use_horiz)
-         newh = gmc->w / gmc->maxa;
+         newh = neww / gmc->maxa;
        else
-         neww = gmc->h * gmc->mina;
+         neww = newh * gmc->mina;
        change = 1;
      }
    else if (aspect < gmc->mina)
      {
        if (use_horiz)
-         newh = gmc->w / gmc->maxa;
+         newh = neww / gmc->maxa;
        else
-         neww = gmc->h * gmc->mina;
+         neww = newh * gmc->mina;
        change = 1;
      }
    if (change)
      {
+       neww += (gmc->pad.l + gmc->pad.r);
+       newh += (gmc->pad.t + gmc->pad.b);
        gmc->x = gmc->x + ((gmc->w - neww) * cx);
        gmc->y = gmc->y + ((gmc->h - newh) * cy);
        gmc->w = neww;
@@ -1963,6 +1992,10 @@
    cf->pos.y = gmc->y - gmc->zone->y;
    cf->pos.w = gmc->zone->w;
    cf->pos.h = gmc->zone->h;
+   cf->pad.l = gmc->pad.l;
+   cf->pad.r = gmc->pad.r;
+   cf->pad.t = gmc->pad.t;
+   cf->pad.b = gmc->pad.b;
    cf->w = gmc->w;
    cf->h = gmc->h;
    cf->edge = gmc->edge;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_gadman.h  25 Aug 2005 07:42:44 -0000      1.14
+++ e_gadman.h  23 Sep 2005 23:40:45 -0000      1.15
@@ -83,6 +83,9 @@
    Evas_Coord           autow, autoh;
    double               ax, ay;
    double               mina, maxa;
+   struct {
+       int l, r, t, b;
+   } pad;
    void               (*func) (void *data, E_Gadman_Client *gmc, 
E_Gadman_Change change);
    void                *data;
    void                *config;
@@ -106,6 +109,7 @@
 EAPI void             e_gadman_client_max_size_set(E_Gadman_Client *gmc, 
Evas_Coord maxw, Evas_Coord maxh);
 EAPI void             e_gadman_client_align_set(E_Gadman_Client *gmc, double 
xalign, double yalign);
 EAPI void             e_gadman_client_aspect_set(E_Gadman_Client *gmc, double 
mina, double maxa);
+EAPI void             e_gadman_client_padding_set(E_Gadman_Client *gmc, int l, 
int r, int t, int b);
 EAPI void             e_gadman_client_auto_size_set(E_Gadman_Client *gmc, 
Evas_Coord autow, Evas_Coord autoh);
 EAPI void             e_gadman_client_edge_set(E_Gadman_Client *gmc, 
E_Gadman_Edge edge);
 EAPI E_Gadman_Edge    e_gadman_client_edge_get(E_Gadman_Client *gmc);




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to