From: Bastian Beranek <bastian.beischer@gmail.com>
To: Juri Linkov <juri@linkov.net>
Cc: 46299@debbugs.gnu.org
Subject: bug#46299: 28.0.50; Value of tab-bar-show not respected in new frames.
Date: Mon, 8 Feb 2021 18:50:40 +0100 [thread overview]
Message-ID: <CAK9AuB_poj9OARv7Gso9_3+U-Trf+dq50U-ZOtXKJn_KdPt0=w@mail.gmail.com> (raw)
In-Reply-To: <CAK9AuB-Hxj4R514g-CvGRfOGiSTfmK6z3g4icpDYAHMBvb_M1Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 108 bytes --]
Hello Juri,
I have tried to clean up my patch a bit more, please see the attached version 3.
Best
Bastian
[-- Attachment #2: tab-bar_v3.patch --]
[-- Type: text/x-patch, Size: 5064 bytes --]
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 6720d82b47..8b94c242bc 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -134,21 +134,41 @@ Possible modifier keys are `control', `meta', `shift', `hyper', `super' and
:ascent center))
tab-bar-close-button)))
+(defun tab-bar--tab-bar-lines-for-frame (frame)
+ "Compute the correct value of tab-bar-lines for the given frame."
+ (if (not tab-bar-mode)
+ 0
+ (cond
+ ((eq tab-bar-show t) 1)
+ ((natnump tab-bar-show)
+ (if (> (length (funcall tab-bar-tabs-function frame)) tab-bar-show) 1 0))
+ (t 0))))
+
+(defun tab-bar--update-tab-bar-lines (&optional frame)
+ "Update frame parameter tab-bar-line.
+When the optional frame parameter is omitted all frames as well
+as the default for new frames are updated. Otherwise only the
+given frame is modified."
+ (if frame
+ ;; Set frame parameters for the given frame
+ (set-frame-parameter frame 'tab-bar-lines (tab-bar--tab-bar-lines-for-frame frame))
+ (progn
+ ;; Loop over all frames and update default-frame-alist
+ (dolist (frame (frame-list))
+ (set-frame-parameter frame 'tab-bar-lines (tab-bar--tab-bar-lines-for-frame frame)))
+ (setq default-frame-alist
+ (cons (cons 'tab-bar-lines (if (and tab-bar-mode (eq tab-bar-show t)) 1 0))
+ (assq-delete-all 'tab-bar-lines default-frame-alist))))))
+
(define-minor-mode tab-bar-mode
"Toggle the tab bar in all graphical frames (Tab Bar mode)."
:global t
;; It's defined in C/cus-start, this stops the d-m-m macro defining it again.
:variable tab-bar-mode
- (let ((val (if tab-bar-mode 1 0)))
- (dolist (frame (frame-list))
- (set-frame-parameter frame 'tab-bar-lines val))
- ;; If the user has given `default-frame-alist' a `tab-bar-lines'
- ;; parameter, replace it.
- (if (assq 'tab-bar-lines default-frame-alist)
- (setq default-frame-alist
- (cons (cons 'tab-bar-lines val)
- (assq-delete-all 'tab-bar-lines
- default-frame-alist)))))
+
+ ;; Recalculate tab-bar-lines for all frames
+ (tab-bar--update-tab-bar-lines)
+
(when tab-bar-mode
(tab-bar--load-buttons))
(if tab-bar-mode
@@ -251,16 +271,8 @@ you can use the command `toggle-frame-tab-bar'."
:set (lambda (sym val)
(set-default sym val)
;; Preload button images
- (tab-bar-mode 1)
- ;; Then handle each frame individually
- (dolist (frame (frame-list))
- (set-frame-parameter
- frame 'tab-bar-lines
- (if (or (eq val t)
- (and (natnump val)
- (> (length (funcall tab-bar-tabs-function frame))
- val)))
- 1 0))))
+ ;; Note: tab-bar-mode updates tab-bar-lines as well.
+ (tab-bar-mode 1))
:group 'tab-bar
:version "27.1")
@@ -852,16 +864,11 @@ After the tab is created, the hooks in
(run-hook-with-args 'tab-bar-tab-post-open-functions
(nth to-index tabs)))
- (cond
- ((eq tab-bar-show t)
- (tab-bar-mode 1))
- ((and (natnump tab-bar-show)
- (> (length (funcall tab-bar-tabs-function)) tab-bar-show)
- (zerop (frame-parameter nil 'tab-bar-lines)))
- (progn
- (tab-bar--load-buttons)
- (tab-bar--define-keys)
- (set-frame-parameter nil 'tab-bar-lines 1))))
+ ;; Recalculate tab-bar-lines and update frames
+ (tab-bar--update-tab-bar-lines (selected-frame))
+ (when tab-bar-mode
+ (tab-bar--load-buttons)
+ (tab-bar--define-keys))
(force-mode-line-update)
(unless tab-bar-mode
@@ -996,11 +1003,8 @@ for the last tab on a frame is determined by
tab-bar-closed-tabs)
(set-frame-parameter nil 'tabs (delq close-tab tabs)))
- (when (and (not (zerop (frame-parameter nil 'tab-bar-lines)))
- (natnump tab-bar-show)
- (<= (length (funcall tab-bar-tabs-function))
- tab-bar-show))
- (set-frame-parameter nil 'tab-bar-lines 0))
+ ;; Recalculate tab-bar-lines and update frames
+ (tab-bar--update-tab-bar-lines (selected-frame))
(force-mode-line-update)
(unless tab-bar-mode
@@ -1036,11 +1040,8 @@ for the last tab on a frame is determined by
(run-hook-with-args 'tab-bar-tab-pre-close-functions (nth index tabs) nil)))
(set-frame-parameter nil 'tabs (list (nth current-index tabs)))
- (when (and (not (zerop (frame-parameter nil 'tab-bar-lines)))
- (natnump tab-bar-show)
- (<= (length (funcall tab-bar-tabs-function))
- tab-bar-show))
- (set-frame-parameter nil 'tab-bar-lines 0))
+ ;; Recalculate tab-bar-lines and update frames
+ (tab-bar--update-tab-bar-lines)
(force-mode-line-update)
(unless tab-bar-mode
next prev parent reply other threads:[~2021-02-08 17:50 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 16:14 bug#46299: 28.0.50; Value of tab-bar-show not respected in new frames Bastian Beischer
2021-02-05 8:54 ` Juri Linkov
2021-02-05 10:10 ` Bastian Beranek
2021-02-05 14:11 ` Bastian Beranek
2021-02-06 12:16 ` Bastian Beranek
2021-02-07 19:05 ` Juri Linkov
2021-02-07 23:03 ` Bastian Beranek
2021-02-08 17:50 ` Bastian Beranek [this message]
2021-02-08 18:19 ` Juri Linkov
2021-02-08 19:04 ` Bastian Beranek
2021-02-09 8:00 ` martin rudalics
2021-02-09 8:15 ` Bastian Beranek
2021-02-09 8:58 ` martin rudalics
2021-02-09 9:23 ` Bastian Beranek
2021-02-09 9:45 ` martin rudalics
2021-02-09 11:44 ` Bastian Beranek
2021-02-09 17:32 ` martin rudalics
2021-02-09 18:06 ` Juri Linkov
2021-02-09 18:46 ` Bastian Beranek
2021-02-09 19:08 ` Eli Zaretskii
2021-02-09 19:01 ` Eli Zaretskii
2021-02-10 18:24 ` Juri Linkov
2021-02-11 12:14 ` Bastian Beranek
2021-02-11 17:34 ` Bastian Beranek
2021-02-12 9:31 ` Juri Linkov
2021-02-12 10:24 ` Bastian Beranek
2021-02-12 14:47 ` Bastian Beranek
2021-02-12 19:23 ` Bastian Beranek
2021-02-13 18:23 ` Juri Linkov
2021-02-13 19:02 ` Bastian Beranek
2021-02-13 19:46 ` Juri Linkov
2021-02-14 18:44 ` Juri Linkov
2021-02-15 10:05 ` Bastian Beranek
2021-02-15 15:26 ` Eli Zaretskii
2021-02-15 15:32 ` Bastian Beranek
2021-02-15 15:53 ` Eli Zaretskii
2021-02-16 10:40 ` Bastian Beranek
2021-02-14 13:08 ` Bastian Beranek
2021-02-14 18:50 ` Juri Linkov
2021-02-14 19:28 ` Juri Linkov
2021-02-15 8:16 ` martin rudalics
2021-02-15 9:07 ` Juri Linkov
2021-02-15 10:08 ` martin rudalics
2021-02-15 10:12 ` Bastian Beranek
2021-02-15 10:09 ` Bastian Beranek
2021-02-15 17:01 ` Juri Linkov
2021-02-15 22:10 ` Bastian Beranek
2021-02-16 2:08 ` bug#46299: [External] : " Drew Adams
2021-02-16 10:59 ` Bastian Beranek
2021-02-16 15:31 ` Bastian Beranek
2021-02-16 17:28 ` Juri Linkov
2021-02-24 18:46 ` Juri Linkov
2021-02-10 18:20 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAK9AuB_poj9OARv7Gso9_3+U-Trf+dq50U-ZOtXKJn_KdPt0=w@mail.gmail.com' \
--to=bastian.beischer@gmail.com \
--cc=46299@debbugs.gnu.org \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).