From 917ca507ab2a4f997c1a45a2ecf9863f017ce4e9 Mon Sep 17 00:00:00 2001 From: cage Date: Fri, 12 May 2023 15:32:54 +0200 Subject: [PATCH] - [GUI] fixed inlining bitmap position. --- src/gui/client/main-window.lisp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp index 83c0c44..4f46e24 100644 --- a/src/gui/client/main-window.lisp +++ b/src/gui/client/main-window.lisp @@ -366,7 +366,7 @@ ((gemini-client:header-success-p status-code) (slurp-non-text-data main-window iri :try-to-open nil)))))) -(defun contextual-menu-link-clrs (link-name link-value main-window) +(defun contextual-menu-link-clrs (link-name link-value main-window line-count) (labels ((add-to-tour-callback () (ev:with-enqueued-process-and-unblock () (comm:make-request :tour-add-link @@ -398,19 +398,18 @@ (re:scan "(?i)gif$" link-value) (re:scan "(?i)bmp$" link-value) (re:scan "(?i)tga$" link-value))) - (open-inline-clsr (x y) - (lambda () - (if (inline-possible-p) - (let* ((file-path (slurp-iri main-window link-value)) - (image (gui:make-image file-path)) - (coordinates `(+ (:x ,x :y ,y) 1 :lines))) - (gui:insert-image (gemtext-widget main-window) image coordinates)) - (funcall (link-click-mouse-1-callback-clsr link-value main-window)))))) + (open-inline-callback () + (if (inline-possible-p) + (let* ((file-path (slurp-iri main-window link-value)) + (image (gui:make-image file-path)) + (coordinates `(+ (:line ,line-count :char 0) 1 :lines))) + (gui:insert-image (gemtext-widget main-window) image coordinates)) + (funcall (link-click-mouse-1-callback-clsr link-value main-window))))) (lambda () (let* ((popup-menu (gui:make-menu nil (_"link menu"))) (x (gui:screen-mouse-x)) (y (gui:screen-mouse-y))) - (gui:make-menubutton popup-menu (_ "Inline") (open-inline-clsr x y)) + (gui:make-menubutton popup-menu (_ "Inline") #'open-inline-callback) (gui:make-menubutton popup-menu (_ "Add link to bookmarks") #'bookmark-link-callback) (gui:make-menubutton popup-menu (_ "Add link to tour") #'add-to-tour-callback) (gui:make-menubutton popup-menu (_ "Copy link to the clipboard") #'copy-link-callback) @@ -509,7 +508,8 @@ :button-3-callback (contextual-menu-link-clrs link-name target-iri - main-window) + main-window + line-number) :over-callback (lambda () (print-info-message target-iri)) :leave-callback