Merge from emacs--devo--0

[gnu-emacs] / lisp / play / gamegrid.el

diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index d604715d4d7528986d4660cfe66cb25bc9398c81..5f2a76e13289484390ad7e6bd58c65727bcfa06c 100644 (file)
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -320,7 +320,14 @@ static unsigned char gamegrid_bits[] = {
                          (< max-height height))
                      (setq max-height height))))))
       (when (and max-height (< max-height 1))
-       (face-spec-set gamegrid-face `((t :height ,max-height)))))))
+       (let ((default-font-height (face-attribute 'default :height))
+             (resy (/ (display-pixel-height) (/ (display-mm-height) 25.4)))
+             point-size pixel-size)
+         (setq point-size (/ (* (float default-font-height) max-height) 10)
+               pixel-size (floor (* resy (/ point-size 72.27)))
+               point-size (* (/ pixel-size resy) 72.27))
+         (face-spec-set gamegrid-face
+                        `((t :height ,(floor (* point-size 10))))))))))
 
 (defun gamegrid-initialize-display ()
   (setq gamegrid-display-mode (gamegrid-display-type))