From 1122dac61888d15561b89f02cfecab48e1d14a8a Mon Sep 17 00:00:00 2001 From: ellson Date: Sun, 21 May 2006 02:17:08 +0000 Subject: [PATCH] support margins in gvrender outputs --- lib/gvc/gvevent.c | 8 ++++---- lib/gvc/gvrender.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c index cb07fe8bb..5e54acfac 100644 --- a/lib/gvc/gvevent.c +++ b/lib/gvc/gvevent.c @@ -299,12 +299,12 @@ static void gvevent_find_current_obj(GVJ_t * job, pointf pointer) /* convert window point to graph coordinates */ if (job->rotation) { - p.x = job->focus.y - (pointer.y - job->height / 2.) / job->compscale.x; - p.y = job->focus.x + (pointer.x - job->width / 2.) / job->compscale.y; + p.x = job->focus.y - (pointer.y - job->height / 2. - job->margin.y) / job->compscale.x; + p.y = job->focus.x + (pointer.x - job->width / 2. - job->margin.x) / job->compscale.y; } else { - p.x = job->focus.x + (pointer.x - job->width / 2.) / job->compscale.x; - p.y = job->focus.y + (pointer.y - job->height / 2.) / job->compscale.y; + p.x = job->focus.x + (pointer.x - job->width / 2. - job->margin.x) / job->compscale.x; + p.y = job->focus.y + (pointer.y - job->height / 2. - job->margin.y) / job->compscale.y; } closeenough = CLOSEENOUGH / job->compscale.x; diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c index 85509615e..4eaa8e82f 100644 --- a/lib/gvc/gvrender.c +++ b/lib/gvc/gvrender.c @@ -182,11 +182,11 @@ static pointf gvrender_ptf(GVJ_t *job, pointf p) return p; if (job->rotation) { - rv.x = -(p.y - job->focus.y) * job->compscale.x + job->width / 2.; - rv.y = -(p.x - job->focus.x) * job->compscale.y + job->height / 2.; + rv.x = -(p.y - job->focus.y) * job->compscale.x + job->width / 2. + job->margin.x; + rv.y = -(p.x - job->focus.x) * job->compscale.y + job->height / 2. + job->margin.y; } else { - rv.x = (p.x - job->focus.x) * job->compscale.x + job->width / 2.; - rv.y = (p.y - job->focus.y) * job->compscale.y + job->height / 2.; + rv.x = (p.x - job->focus.x) * job->compscale.x + job->width / 2. + job->margin.x; + rv.y = (p.y - job->focus.y) * job->compscale.y + job->height / 2. + job->margin.y; } return rv; } -- 2.40.0