From 7bf832f17d73ca5336c6fe621b9ff2138c8b43cc Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 28 Aug 2014 13:43:07 +0200 Subject: glut: Fit W, H, and Z to canvas size instead of window size. --- platform/glut/glut-main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/glut/glut-main.c b/platform/glut/glut-main.c index cb089087..92d56cd0 100644 --- a/platform/glut/glut-main.c +++ b/platform/glut/glut-main.c @@ -443,18 +443,18 @@ static void toggle_fullscreen(void) static void auto_zoom_w(void) { - currentzoom = fz_clamp(currentzoom * screen_w / (float)page_w, MINRES, MAXRES); + currentzoom = fz_clamp(currentzoom * canvas_w / (float)page_w, MINRES, MAXRES); } static void auto_zoom_h(void) { - currentzoom = fz_clamp(currentzoom * screen_h / (float)page_h, MINRES, MAXRES); + currentzoom = fz_clamp(currentzoom * canvas_h / (float)page_h, MINRES, MAXRES); } static void auto_zoom(void) { float page_a = (float) page_w / page_h; - float screen_a = (float) screen_w / screen_h; + float screen_a = (float) canvas_w / canvas_h; if (page_a > screen_a) auto_zoom_w(); else -- cgit v1.2.3