github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-23 19:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix invalid mouse-face in inactive windows.

Browse source
This commit is contained in:
Vincent Zhang 2019-03-04 01:43:53 +07:00
parent 9c283f50bd
commit ab7f854d89
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
doom-modeline-segments.el
View file

@ -318,7 +318,8 @@ directory, the file name, and its state (modified, read-only or non-existent)."
'face `(:height 'face `(:height
,(doom-modeline-icon-height 1.1) ,(doom-modeline-icon-height 1.1)
:family :family
,(all-the-icons-icon-family icon)))) ,(all-the-icons-icon-family icon)
:inherit t)))
(if active doom-modeline-vspc doom-modeline-inactive-vspc)))) (if active doom-modeline-vspc doom-modeline-inactive-vspc))))
;; state icon ;; state icon
@ -333,7 +334,8 @@ directory, the file name, and its state (modified, read-only or non-existent)."
`(:height `(:height
,(doom-modeline-icon-height 1.3) ,(doom-modeline-icon-height 1.3)
:family :family
,(all-the-icons-icon-family icon)) ,(all-the-icons-icon-family icon)
:inherit t)
'mode-line-inactive))) 'mode-line-inactive)))
(if active doom-modeline-vspc doom-modeline-inactive-vspc))) (if active doom-modeline-vspc doom-modeline-inactive-vspc)))
@ -369,7 +371,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
" ") " ")
'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive) 'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive)
'help-echo 'mode-line-mule-info-help-echo 'help-echo 'mode-line-mule-info-help-echo
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map mode-line-coding-system-map)) 'local-map mode-line-coding-system-map))
@ -536,7 +538,8 @@ Uses `all-the-icons-octicon' to fetch the icon."
`(:height `(:height
,(doom-modeline-icon-height 1.2) ,(doom-modeline-icon-height 1.2)
:family :family
,(all-the-icons-icon-family icon)) ,(all-the-icons-icon-family icon)
:inherit t)
'mode-line-inactive)) 'mode-line-inactive))
doom-modeline-inactive-vspc doom-modeline-inactive-vspc
(propertize text 'face 'mode-line-inactive))) (propertize text 'face 'mode-line-inactive)))
@ -595,7 +598,7 @@ mouse-2: Show help for minor mode")
('errored "Error") ('errored "Error")
('interrupted "Interrupted") ('interrupted "Interrupted")
('suspicious "Suspicious"))) ('suspicious "Suspicious")))
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map (let ((map (make-sparse-keymap))) 'local-map (let ((map (make-sparse-keymap)))
(define-key map [mode-line down-mouse-1] (define-key map [mode-line down-mouse-1]
flycheck-mode-menu-map) flycheck-mode-menu-map)
@ -731,7 +734,7 @@ wheel-up/wheel-down: Previous/next error"))
mouse-1: Display minor mode menu mouse-1: Display minor mode menu
mouse-2: Show help for minor mode" mouse-2: Show help for minor mode"
(length running) (length known))))) (length running) (length known)))))
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map (let ((map (make-sparse-keymap))) 'local-map (let ((map (make-sparse-keymap)))
(define-key map [mode-line down-mouse-1] (define-key map [mode-line down-mouse-1]
flymake-menu) flymake-menu)
@ -1036,7 +1039,7 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive) 'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive)
'help-echo "Buffer size 'help-echo "Buffer size
mouse-1: Display Line and Column Mode Menu" mouse-1: Display Line and Column Mode Menu"
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map mode-line-column-line-number-mode-map))) 'local-map mode-line-column-line-number-mode-map)))
(doom-modeline-def-segment matches (doom-modeline-def-segment matches
@ -1295,7 +1298,7 @@ See `mode-line-percent-position'.")
(propertize (format-mode-line lc) (propertize (format-mode-line lc)
'help-echo "Buffer position\n\ 'help-echo "Buffer position\n\
mouse-1: Display Line and Column Mode Menu" mouse-1: Display Line and Column Mode Menu"
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map mode-line-column-line-number-mode-map)) 'local-map mode-line-column-line-number-mode-map))
(propertize (propertize
(concat " " (concat " "
@ -1308,7 +1311,7 @@ mouse-1: Display Line and Column Mode Menu"
'face (if active 'mode-line 'mode-line-inactive) 'face (if active 'mode-line 'mode-line-inactive)
'help-echo "Buffer position\n\ 'help-echo "Buffer position\n\
mouse-1: Display Line and Column Mode Menu" mouse-1: Display Line and Column Mode Menu"
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map mode-line-column-line-number-mode-map)))) 'local-map mode-line-column-line-number-mode-map))))
;; ;;
@ -1514,7 +1517,7 @@ Example:
'help-echo "Github Notifications 'help-echo "Github Notifications
mouse-1: Show notifications mouse-1: Show notifications
mouse-3: Fetch notifications" mouse-3: Fetch notifications"
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map (let ((map (make-sparse-keymap))) 'local-map (let ((map (make-sparse-keymap)))
(define-key map [mode-line mouse-1] (define-key map [mode-line mouse-1]
(lambda () (lambda ()
@ -1548,7 +1551,7 @@ mouse-3: Fetch notifications"
(propertize "!" 'face 'doom-modeline-urgent)) (propertize "!" 'face 'doom-modeline-urgent))
'help-echo "Debug on Error 'help-echo "Debug on Error
mouse-1: Toggle Debug on Error" mouse-1: Toggle Debug on Error"
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-error))) 'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-error)))
(when debug-on-quit (when debug-on-quit
(propertize (propertize
@ -1557,7 +1560,7 @@ mouse-1: Toggle Debug on Error"
(propertize "!" 'face 'doom-modeline-warning)) (propertize "!" 'face 'doom-modeline-warning))
'help-echo "Debug on Quit 'help-echo "Debug on Quit
mouse-1: Toggle Debug on Quit" mouse-1: Toggle Debug on Quit"
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-quit))) 'local-map (make-mode-line-mouse-map 'mouse-1 #'toggle-debug-on-quit)))
(and (or debug-on-error debug-on-quit) " ")))) (and (or debug-on-error debug-on-quit) " "))))
@ -1601,7 +1604,7 @@ mouse-1: Toggle Debug on Quit"
doom-modeline-vspc doom-modeline-vspc
(propertize (number-to-string mu4e-alert-mode-line) (propertize (number-to-string mu4e-alert-mode-line)
'face '(:inherit (doom-modeline-warning doom-modeline-unread-number)))) 'face '(:inherit (doom-modeline-warning doom-modeline-unread-number))))
'mouse-face 'mode-line 'mouse-face '(:inherit t)
'help-echo (if (= mu4e-alert-mode-line 1) 'help-echo (if (= mu4e-alert-mode-line 1)
"You have an unread email" "You have an unread email"
(format "You have %s unread emails" mu4e-alert-mode-line))) (format "You have %s unread emails" mu4e-alert-mode-line)))