feat: Partial scroll bars support (#774)

* feat: Partial scroll bars support * rev no-focus-on-map
emacs-lsp · Apr 23, 2024 · 2293f8c · 2293f8c
1 parent 703fc51
commit 2293f8c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lsp-ui-doc.el b/lsp-ui-doc.el
@@ -516,17 +516,20 @@ FRAME just below the symbol at point."
                             (if (< (car it) (window-start))
                                 (cons 0 0)
                               (posn-x-y (posn-at-point (1- (window-end))))))))
-          (frame-relative-symbol-x (+ start-x x (* (frame-char-width) 2)))
-          (frame-relative-symbol-y (+ start-y y))
+          (char-width (frame-char-width))
           (char-height (frame-char-height))
+          (sbw (or (window-scroll-bar-width) 0))
+          (sbh (or (window-scroll-bar-height) 0))
+          (frame-relative-symbol-x (+ start-x x (* char-width 2) sbw))
+          (frame-relative-symbol-y (+ start-y y (- 0 sbh)))
           ;; Make sure the frame is positioned horizontally such that
           ;; it does not go beyond the frame boundaries.
           (frame-x (or (and (<= (frame-outer-width) (+ frame-relative-symbol-x width))
                             (- x (- (+ frame-relative-symbol-x width)
                                     (frame-outer-width))))
                        x))
           (frame-y (+ (or (and (<= height frame-relative-symbol-y)
-                               (- y height))
+                               (- y height sbh))
                           (+ y char-height))
                       (if (fboundp 'window-tab-line-height) (window-tab-line-height) 0))))
     (cons (+ start-x frame-x) (+ start-y frame-y))))