From a08f09ac4333a9372d7d8e00a9859f7605ef24f3 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Fri, 30 Oct 2015 16:29:06 -0400
Subject: [PATCH] kludge to account for menubar in patch height. (Might want to
rethink the whole idea of menubars in patch windows...)
---
pd/nw/index.js | 6 +++++-
pd/nw/pdgui.js | 6 ++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pd/nw/index.js b/pd/nw/index.js
index 8917238b0..d3312ac11 100644
--- a/pd/nw/index.js
+++ b/pd/nw/index.js
@@ -747,7 +747,11 @@ function nw_create_window(cid, type, width, height, xpos, ypos, menu_flag,
toolbar: false,
focus: true,
width: width,
- height: height,
+ // We add 23 as a kludge to account for the menubar at the top of
+ // the window. Ideally we would just get rid of the canvas menu
+ // altogether to simplify things. But we'd have to add some kind of
+ // widget for the "Put" menu.
+ height: height + 23,
x: xpos,
y: ypos
});
diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index 9197936c3..7d8f46653 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -292,11 +292,13 @@ function pd_geo_string(w, h, x, y) {
// pd.tk
function canvas_check_geometry(cid) {
var win_w = patchwin[cid].width,
- win_h = patchwin[cid].height,
+ // "23" is a kludge to account for the menubar size. See comment
+ // in nw_create_window of index.js
+ win_h = patchwin[cid].height - 23,
win_x = patchwin[cid].x,
win_y = patchwin[cid].y,
cnv_width = patchwin[cid].window.innerWidth,
- cnv_height = patchwin[cid].window.innerHeight;
+ cnv_height = patchwin[cid].window.innerHeight - 23;
// We're reusing win_x and win_y below, as it
// shouldn't make a difference to the bounds
// algorithm in Pd
--
GitLab