From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 13 Jun 2004 17:02:52 +0000 (+0000)
Subject: White background, better window size, sane
X-Git-Tag: release/2.3.4~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9a9ef591c5eb018ea064043c1065cf3fd0d1bc89;p=lilypond.git

White background, better window size, sane
canvas size.
---

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 2aa66f1d96..16564c6fb5 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -524,10 +524,14 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
 (define (papersize window paper)
   (let* ((hsize (ly:output-def-lookup paper 'hsize))
 	 (vsize (ly:output-def-lookup paper 'vsize))
-	 (width (inexact->exact (ceiling (* output-scale hsize))))
-	 (height (inexact->exact (ceiling (* output-scale vsize))))
+	 ;; 2?
+	 (width (inexact->exact (ceiling (* output-scale 2 hsize))))
+	 (height (inexact->exact (ceiling (* output-scale 2 vsize))))
 	 (max-width (gdk-screen-width))
 	 (max-height (gdk-screen-height)))
+
+    ;; ughr: panels?
+    (set! max-height (- max-height 80))
     
     (set! window-width (min width max-width))
     (set! window-height (min height max-height))
@@ -566,6 +570,7 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
 	 (canvas (new-canvas)))
 
     (papersize window bookpaper)
+    (set-size-request window window-width window-height)
     ;;; (ly:bookpaper-outputscale bookpaper))))
     
     (add window vbox)