[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a9785bd 12/16: Dynamically resize WebKit widget.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a9785bd 12/16: Dynamically resize WebKit widget. |
Date: |
Wed, 26 Oct 2016 06:07:21 +0000 (UTC) |
branch: master
commit a9785bd5c2e27e949040342e441c1a65a5b650d0
Author: Ricardo Wurmus <address@hidden>
Commit: Paul Eggert <address@hidden>
Dynamically resize WebKit widget.
* lisp/xwidget.el (xwidget-webkit-auto-adjust-size,
xwidget-webkit-adjust-size-in-frame): New procedures.
(xwidget-webkit-new-session): Remove hint to resize widget with `a'.
(xwidget-webkit-adjust-size-dispatch): Resize current webkit widget.
(xwidget-webkit-adjust-size-to-window): Make non-interactive,
add widget and window as arguments.
(xwidget-webkit-callback): Use xwidget-webkit-adjust-size-to-window.
---
lisp/xwidget.el | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index e5b51ce..13e3fdf2 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -199,7 +199,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the
originating xwidget."
(xwidget-log "webkit finished loading: '%s'" title)
;;TODO - check the native/internal scroll
;;(xwidget-adjust-size-to-content xwidget)
- (xwidget-webkit-adjust-size-dispatch) ;;TODO xwidget arg
+ (xwidget-webkit-adjust-size-to-window xwidget)
(rename-buffer (format "*xwidget webkit: %s *" title))))
(pop-to-buffer (current-buffer)))
((eq xwidget-event-type 'decide-policy)
@@ -411,18 +411,18 @@ For example, use this to display an anchor."
(defun xwidget-webkit-adjust-size-dispatch ()
"Adjust size according to mode."
(interactive)
- (xwidget-webkit-adjust-size-to-window)
+ (xwidget-webkit-adjust-size-to-window (xwidget-webkit-current-session))
;; The recenter is intended to correct a visual glitch.
;; It errors out if the buffer isn't visible, but then we don't get
;; the glitch, so silence errors.
(ignore-errors
(recenter-top-bottom)))
-(defun xwidget-webkit-adjust-size-to-window ()
- "Adjust webkit to window."
- (interactive)
- (xwidget-resize (xwidget-webkit-current-session) (window-pixel-width)
- (window-pixel-height)))
+(defun xwidget-webkit-adjust-size-to-window (xwidget &optional window)
+ "Adjust the size of the webkit XWIDGET to fit the WINDOW."
+ (xwidget-resize xwidget
+ (window-pixel-width window)
+ (window-pixel-height window)))
(defun xwidget-webkit-adjust-size (w h)
"Manually set webkit size to width W, height H."
@@ -437,6 +437,21 @@ For example, use this to display an anchor."
(car (window-inside-pixel-edges)))
1000))
+(defun xwidget-webkit-auto-adjust-size (window)
+ "Adjust the size of the webkit widget in the given WINDOW."
+ (with-current-buffer (window-buffer window)
+ (when (eq major-mode 'xwidget-webkit-mode)
+ (let ((xwidget (xwidget-webkit-current-session)))
+ (xwidget-webkit-adjust-size-to-window xwidget window)))))
+
+(defun xwidget-webkit-adjust-size-in-frame (frame)
+ "Dynamically adjust webkit widget for all windows of the FRAME."
+ (walk-windows 'xwidget-webkit-auto-adjust-size 'no-minibuf frame))
+
+(eval-after-load 'xwidget-webkit-mode
+ (add-to-list 'window-size-change-functions
+ 'xwidget-webkit-adjust-size-in-frame))
+
(defun xwidget-webkit-new-session (url)
"Create a new webkit session buffer with URL."
(let*
@@ -444,7 +459,9 @@ For example, use this to display an anchor."
xw)
(setq xwidget-webkit-last-session-buffer (switch-to-buffer
(get-buffer-create bufname)))
- (insert " 'a' adjusts the xwidget size.")
+ ;; The xwidget id is stored in a text property, so we need to have
+ ;; at least character in this buffer.
+ (insert " ")
(setq xw (xwidget-insert 1 'webkit bufname
(window-pixel-width)
(window-pixel-height)))
- [Emacs-diffs] master cc3b868 05/16: xwidget: Get title via asynchronous JavaScript., (continued)
- [Emacs-diffs] master cc3b868 05/16: xwidget: Get title via asynchronous JavaScript., Paul Eggert, 2016/10/26
- [Emacs-diffs] master ca479f9 15/16: xwidget: Map "previous-line" and "next-line" to scroll, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 01c2fba 14/16: xwidget: Bind "beginning-of-buffer" and "end-of-buffer", Paul Eggert, 2016/10/26
- [Emacs-diffs] master 623deaf 02/16: xwidget: Pass JavaScript return value to optional callback procedure, Paul Eggert, 2016/10/26
- [Emacs-diffs] master ff80a9c 04/16: xwidget: Do not use `xwidget-execute-script-rv' to insert string, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 7ee870e 03/16: Remove scrolled window container around WebKit widget, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 67e0331 10/16: xwidget: Remove title hack., Paul Eggert, 2016/10/26
- [Emacs-diffs] master e443eab 13/16: Implement zoom for WebKit widget., Paul Eggert, 2016/10/26
- [Emacs-diffs] master d781662 01/16: xwidget: Use WebKit2 API, Paul Eggert, 2016/10/26
- [Emacs-diffs] master c483fa6 11/16: Let initial WebKit view fill window, Paul Eggert, 2016/10/26
- [Emacs-diffs] master a9785bd 12/16: Dynamically resize WebKit widget.,
Paul Eggert <=
- [Emacs-diffs] master efa269d 07/16: xwidget: Add function to find element by CSS selector, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 7457644 06/16: xwidget: Simplify functions to scroll to elements, Paul Eggert, 2016/10/26
- [Emacs-diffs] master 5edf76b 16/16: * src/xwidget.c (webkit_js_to_lisp): Now static., Paul Eggert, 2016/10/26