From 0d2b0aef51c700ad4a664be559beae8ed0877f85 Mon Sep 17 00:00:00 2001 From: Nathaniel Nicandro Date: Fri, 8 Feb 2019 02:14:31 -0600 Subject: Set :data-2x key as an image property on supported systems --- lisp/pdf-view.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/pdf-view.el b/lisp/pdf-view.el index d4367fd..5812f22 100644 --- a/lisp/pdf-view.el +++ b/lisp/pdf-view.el @@ -922,8 +922,14 @@ See also `pdf-view-use-imagemagick'." ;; TODO: add DATA and PROPS to docstring. "Like `create-image', but with set DATA-P and TYPE arguments." (declare (indent 1) (debug t)) - `(create-image ,data (pdf-view-image-type) t ,@props - :relief (or pdf-view-image-relief 0))) + (let ((image-data (make-symbol "data"))) + `(let ((,image-data ,data)) + (apply #'create-image ,image-data (pdf-view-image-type) t ,@props + (cl-list* + :relief (or pdf-view-image-relief 0) + (when (and (eq (framep-on-display) 'mac) + (= (pdf-util-frame-scale-factor) 2)) + (list :data-2x ,image-data))))))) (defun pdf-view-create-page (page &optional window) "Create an image of PAGE for display on WINDOW." @@ -935,9 +941,6 @@ See also `pdf-view-use-imagemagick'." (* 2 (car size))))) (hotspots (pdf-view-apply-hotspot-functions window page size))) - (when (and (eq (framep-on-display) 'mac) - (= (pdf-util-frame-scale-factor) 2)) - (put-text-property 0 1 :data-2x data data)) (pdf-view-create-image data :width (car size) :map hotspots -- cgit v1.0