Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use text scale in calculating visible window height #1499

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use text scale in calculating visible window height #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f8e3ec
Use text scale in calculating visible window height (fix #1497)
countvajhula Jul 23, 2021
c9f9913
minor improvement to decouple two actions taken during scrolling
countvajhula Jul 24, 2021
e848986
add missing import
countvajhula Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions evil-commands.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ If the scroll count is zero the command scrolls half the screen."
(when (= (point-min) (line-beginning-position))
(signal 'beginning-of-buffer nil))
(when (zerop count)
(setq count (/ (window-body-height) 2)))
(setq count (/ (evil-window-visible-height) 2)))
(let ((xy (evil-posn-x-y (posn-at-point))))
(condition-case nil
(progn
Expand All @@ -1067,28 +1067,31 @@ If the scroll count is zero the command scrolls half the screen."
(setq evil-scroll-count count)
(when (eobp) (signal 'end-of-buffer nil))
(when (zerop count)
(setq count (/ (window-body-height) 2)))
(setq count (/ (evil-window-visible-height) 2)))
;; BUG #660: First check whether the eob is visible.
;; In that case we do not scroll but merely move point.
(if (<= (point-max) (window-end))
(if (pos-visible-in-window-p (point-max))
(with-no-warnings (next-line count nil))
(let ((xy (evil-posn-x-y (posn-at-point))))
(condition-case nil
(progn
(scroll-up count)
(let* ((wend (window-end nil t))
(p (posn-at-x-y (car xy) (cdr xy)))
(let* ((p (posn-at-x-y (car xy) (cdr xy)))
(margin (max 0 (- scroll-margin
(cdr (posn-col-row p))))))
;; return point to its original window-relative
;; position prior to scrolling
(goto-char (posn-point p))
;; ensure point is not within the scroll-margin
(when (> margin 0)
(with-no-warnings (next-line margin))
(recenter scroll-margin))
(when (<= (point-max) wend)
(save-excursion
(goto-char (point-max))
(recenter (- (max 1 scroll-margin)))))))
(recenter scroll-margin)))
;; once the end of the buffer is visible, ensure it
;; is positioned near the bottom of the window
(when (pos-visible-in-window-p (point-max))
(save-excursion
(goto-char (point-max))
(recenter (- (max 1 scroll-margin))))))
(end-of-buffer
(goto-char (point-max))
(recenter (- (max 1 scroll-margin)))))))))
Expand Down
13 changes: 13 additions & 0 deletions evil-common.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
(require 'thingatpt)
(require 'cl-lib)
(require 'calc)
(require 'face-remap)

;;; Code:

Expand Down Expand Up @@ -3980,6 +3981,18 @@ PROPERTIES is a property-list which supports the following properties:
(evil-motion-state))
(switch-to-buffer-other-window buf))))

;;; Window

(defun evil-window-visible-height (&optional window)
"The visible height of WINDOW in lines.

If no WINDOW is specified, use the selected one."
(let ((window (or window (selected-window))))
(save-window-excursion
(select-window window)
(let ((current-scale (expt text-scale-mode-step text-scale-mode-amount)))
(round (/ (window-body-height) current-scale))))))

(provide 'evil-common)

;;; evil-common.el ends here