mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 14:10:47 -08:00
Code Issues Projects Releases Wiki Activity

Add user option to only display default tool bar

Browse source 
This works well with `window-tool-bar-mode', to be added in upcoming
commit.  Then the default tool bar is displayed frame-wide and
mode-specific tool bars are displayed in the window that mode is
active in.

* lisp/tool-bar.el (tool-bar-always-show-default): New user option.
(tool-bar--cache-key, tool-bar-make-keymap-1): Return default tool bar
when option is set.
This commit is contained in:
Jared Finder 2024-01-26 10:08:30 -08:00 • committed by Eli Zaretskii
parent fd3ab22a3e
commit da325ff7b2
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/tool-bar.el
View file

@ -100,7 +100,9 @@ parameter is set to `top', and above the tool bar it is set to
(defconst tool-bar-keymap-cache (make-hash-table :test #'equal))
(defsubst tool-bar--cache-key ()
(cons (frame-terminal) (sxhash-eq tool-bar-map)))
(cons (frame-terminal)
(sxhash-eq (if tool-bar-always-show-default (default-value 'tool-bar-map)
tool-bar-map))))
(defsubst tool-bar--secondary-cache-key ()
(cons (frame-terminal) (sxhash-eq secondary-tool-bar-map)))
@ -191,7 +193,9 @@ in which case the value of `tool-bar-map' is used instead."
bind))
(plist-put plist :image image)))
bind))
(or map tool-bar-map)))
(or map
(if tool-bar-always-show-default (default-value 'tool-bar-map)
tool-bar-map))))
;;;###autoload
(defun tool-bar-add-item (icon def key &rest props)
@ -378,6 +382,15 @@ the tool bar."
(modify-all-frames-parameters
(list (cons 'tool-bar-position val))))))
(defcustom tool-bar-always-show-default nil
"If non-nil, `tool-bar-mode' only shows the default tool bar.
This works well when also using `global-window-tool-bar-mode' to
display buffer-specific tool bars."
:type 'boolean
:group 'frames
:group 'mouse
:version "30.1")
;; Modifier bar mode.