[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/icomplete-vertical b64a4c9 10/16: Fix icomplete prompt not visib
From: |
Jimmy Aguilar Mena |
Subject: |
feature/icomplete-vertical b64a4c9 10/16: Fix icomplete prompt not visible in icomplete-vertical (bug#24293) |
Date: |
Tue, 15 Sep 2020 05:34:18 -0400 (EDT) |
branch: feature/icomplete-vertical
commit b64a4c90c4e4fe8f3a25931f44c39ca3b01af6c2
Author: Jimmy Aguilar Mena <spacibba@aol.com>
Commit: Jimmy Aguilar Mena <spacibba@aol.com>
Fix icomplete prompt not visible in icomplete-vertical (bug#24293)
* lisp/icomplete.el (icomplete--vertical-prospects) : Use pixels to
calculate the maximum number of visible prospects instead of line
numbers because different fonts may produce a wrong estimation.
---
lisp/icomplete.el | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index ccf85a2..ef46fd5 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -520,18 +520,21 @@ Conditions are:
(defun icomplete--vertical-prospects (match-braket prefix most _determ comps)
"List of vertical completions limited."
;; Max total rows to use, including the minibuffer content.
- (let ((prefix-len (and (stringp prefix)
- ;; Only hide the prefix if the corresponding info
- ;; is already displayed via `most'.
- (string-prefix-p prefix most t)
- (length prefix)))
- (prospects-rows (+ 1 (cl-count ?\n match-braket))) ;; prompt + row new
line around match
- (prospects-max-rows (cond ((floatp max-mini-window-height)
- (floor (* (frame-height)
max-mini-window-height)))
- ((integerp max-mini-window-height)
- max-mini-window-height)
- (t icomplete-prospects-height)))
- limit prospects comp)
+ (let* ((prefix-len (and (stringp prefix)
+ ;; Only hide the prefix if the corresponding info
+ ;; is already displayed via `most'.
+ (string-prefix-p prefix most t)
+ (length prefix)))
+ (line-height (line-pixel-height))
+ (prospects-max-height (cond ((floatp max-mini-window-height)
+ (floor (* max-mini-window-height
(frame-pixel-height))))
+ ((integerp max-mini-window-height)
+ (floor (* max-mini-window-height
line-height)))
+ (t
+ (* icomplete-prospects-height
line-height))))
+ ;; prompt + row new line around match
+ (prospects-rows-pixel (* (1+ (cl-count ?\n match-braket))
line-height))
+ limit prospects comp)
;; First candidate
(when (and prefix-len
@@ -539,16 +542,15 @@ Conditions are:
(push (substring (car comps) prefix-len) prospects)
(setq comps (cdr comps)
- prospects-rows (1+ prospects-rows)))
+ prospects-rows-pixel (+ prospects-rows-pixel line-height)))
;; The others
(while (and comps (not limit))
(setq comp (car comps)
comps (cdr comps))
+ (setq prospects-rows-pixel (+ prospects-rows-pixel line-height))
- (setq prospects-rows (1+ prospects-rows))
-
- (if (< prospects-rows prospects-max-rows)
+ (if (< prospects-rows-pixel prospects-max-height)
(push comp prospects)
(push icomplete-ellipsis prospects)
(setq limit t)))
- branch feature/icomplete-vertical created (now f80a97f), Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical 0657616 01/16: Add variables for icomplete indicators., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical d76b5ae 04/16: Icomplete-vertical fix first candidate and icomplete-hide-common-prefix., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical b64a4c9 10/16: Fix icomplete prompt not visible in icomplete-vertical (bug#24293),
Jimmy Aguilar Mena <=
- feature/icomplete-vertical 4de4123 06/16: Add modified local map for icomplete., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical fc839ec 08/16: Add icomplete--format-function to format items., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical da9b365 02/16: WIP_minor, Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical e2ffe81 05/16: icomplete-vertical code simplify, Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical 157895a 03/16: Improve icomplete-vertical implementation., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical 4678b15 11/16: Improve vertical height calculation when not in minibuffer, Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical 7568436 12/16: Fix previous commit., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical 6ec1ac1 07/16: icomplete add item format., Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical 438a0b3 13/16: Improve formated size calculation, Jimmy Aguilar Mena, 2020/09/15
- feature/icomplete-vertical dce9b28 09/16: Add special management of first candidate, Jimmy Aguilar Mena, 2020/09/15