From 7295fa71a42de4a5bb4f2449005d71251899d062 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Tue, 8 Jan 2013 03:45:49 +0100 Subject: libdraw: fix wrong menusel() calculation for menuhit() (noticable with small fonts) the text for a menu entry is drawn from: y = textr.min.y + i*(font->height+Vspacing); but we calculated the item from: r = insetrect(textr); i = (p.y - r.min.y) / (font->height+Vspacing); the insetrect is wrong. --- sys/src/libdraw/emenuhit.c | 1 - sys/src/libdraw/menuhit.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/src/libdraw/emenuhit.c b/sys/src/libdraw/emenuhit.c index d1f23a4aa..8e34fe942 100644 --- a/sys/src/libdraw/emenuhit.c +++ b/sys/src/libdraw/emenuhit.c @@ -68,7 +68,6 @@ menurect(Rectangle r, int i) static int menusel(Rectangle r, Point p) { - r = insetrect(r, Margin); if(!ptinrect(p, r)) return -1; return (p.y-r.min.y)/(font->height+Vspacing); diff --git a/sys/src/libdraw/menuhit.c b/sys/src/libdraw/menuhit.c index 851c97676..cea8bb716 100644 --- a/sys/src/libdraw/menuhit.c +++ b/sys/src/libdraw/menuhit.c @@ -69,7 +69,6 @@ menurect(Rectangle r, int i) static int menusel(Rectangle r, Point p) { - r = insetrect(r, Margin); if(!ptinrect(p, r)) return -1; return (p.y-r.min.y)/(font->height+Vspacing); -- cgit v1.2.3