From 5795d700686acb114781cf88088f665da494ad85 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 19 Jan 2005 15:55:27 +0000 Subject: [PATCH] tested and working... todo FIXME's still left... SVN revision: 13017 --- src/bin/e_gadman.c | 8 ++++---- src/bin/e_main.c | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/bin/e_gadman.c b/src/bin/e_gadman.c index 2ce977ed6..241412410 100644 --- a/src/bin/e_gadman.c +++ b/src/bin/e_gadman.c @@ -6,10 +6,10 @@ /* FIXME: corner case if module is sized to full screen... cant stop edit or */ /* re-enter edit mode (cant access root menu) */ -/* FIXME: handle drag from zone to zone */ +/* FIXME: evas_clip to the zone - make a zone clip for gadman obj's */ +/* FIXME: actully call callbacks */ /* FIXME: handle save */ /* FIXME: handle load */ -/* FIXME: start move - raise and callback */ /* FIXME: if u set align, or minmax size or edge then figure out new-coords */ /* FIXME: handle move resist */ /* FIXME: handle resize resist */ @@ -610,7 +610,7 @@ _e_gadman_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, E_Zone *nz; nz = e_container_zone_at_point_get(gmc->zone->container, x, y); - if (nz != gmc->zone) + if ((nz) && (nz != gmc->zone)) { gmc->zone = nz; new_zone = 1; @@ -690,7 +690,7 @@ _e_gadman_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, E_Zone *nz; nz = e_container_zone_at_point_get(gmc->zone->container, x, y); - if (nz != gmc->zone) + if ((nz) && (nz != gmc->zone)) { gmc->zone = nz; new_zone = 1; diff --git a/src/bin/e_main.c b/src/bin/e_main.c index c26cebba9..954bc7649 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -539,18 +539,21 @@ _e_main_screens_init(void) E_Gadman_Client *gmc; gmc = e_gadman_client_new(con->gadman); - gmc->x = 20; - gmc->y = 0; - gmc->w = 200; - gmc->h = 100; + gmc->x = 0; + gmc->y = 300; + gmc->w = 100; + gmc->h = 200; e_gadman_client_policy_set(gmc, - E_GADMAN_POLICY_EDGES | +// E_GADMAN_POLICY_EDGES | + E_GADMAN_POLICY_ANYWHERE | + E_GADMAN_POLICY_HMOVE | + E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VSIZE); e_gadman_client_min_size_set(gmc, 20, 20); - e_gadman_client_auto_size_set(gmc, 200, 50); - e_gadman_client_align_set(gmc, 0.5, 0.0); - e_client_gadman_edge_set(gmc, E_GADMAN_EDGE_TOP); + e_gadman_client_auto_size_set(gmc, 50, 200); + e_gadman_client_align_set(gmc, 0.0, 0.5); + e_client_gadman_edge_set(gmc, E_GADMAN_EDGE_LEFT); } } free(roots);