ryuslash/mode-icons
1
0
Fork 0
mirror of https://github.com/ryuslash/mode-icons.git synced 2024-11-21 17:40:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove face, just add the font property.

Browse source
This commit is contained in:
Matthew L. Fidler 2016-02-07 22:42:43 -06:00
parent 0462ef4239
commit 5be52add14
1 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
mode-icons.el
View file

@ -46,10 +46,6 @@ absolute path to ICON."
(defvar mode-icons-octicons-font (defvar mode-icons-octicons-font
(find-font (font-spec :name "github-octicons"))) (find-font (font-spec :name "github-octicons")))
(when mode-icons-octicons-font
(make-face 'mode-icons-octicons)
(set-face-attribute 'mode-icons-octicons nil
:font mode-icons-octicons-font))
(defcustom mode-icons (defcustom mode-icons
`(("CSS" "css" xpm) `(("CSS" "css" xpm)
@ -117,13 +113,21 @@ the icon."
`(image :type ,type :file ,icon-path :ascent center))) `(image :type ,type :file ,icon-path :ascent center)))
(defcustom mode-icons-minor-mode-base-text-properties (defcustom mode-icons-minor-mode-base-text-properties
'('help-echo 'rm--help-echo '('help-echo nil
'mouse-face 'mode-line-highlight 'mouse-face 'mode-line-highlight
'local-map mode-line-minor-mode-keymap) 'local-map mode-line-minor-mode-keymap)
"List of text propeties to apply to every minor mode." "List of text propeties to apply to every minor mode."
:type '(repeat sexp) :type '(repeat sexp)
:group 'mode-icons) :group 'mode-icons)
(defcustom mode-icons-major-mode-base-text-properties
'('help-echo "Major mode\nmouse-1: Display major mode menu\nmouse-2: Show help for major mode\nmouse-3: Toggle minor modes"
'mouse-face 'mode-line-highlight
'local-map mode-line-major-mode-keymap)
"List of text propeties to apply to every major mode."
:type '(repeat sexp)
:group 'mode-icons)
(defvar mode-icons-powerline-p nil) (defvar mode-icons-powerline-p nil)
(defun mode-icons-need-update-p () (defun mode-icons-need-update-p ()
"Determine if the mode-icons need an update." "Determine if the mode-icons need an update."
@ -139,9 +143,7 @@ ICON-SPEC should be a specification from `mode-icons'."
(cond (cond
((not (nth 1 icon-spec)) "") ((not (nth 1 icon-spec)) "")
((and mode-icons-octicons-font (stringp (nth 1 icon-spec)) (eq (nth 2 icon-spec) 'octicons)) ((and mode-icons-octicons-font (stringp (nth 1 icon-spec)) (eq (nth 2 icon-spec) 'octicons))
(message "Trying %s" (propertize mode 'display (nth 1 icon-spec) 'face 'mode-icons-octicons (propertize mode 'display (nth 1 icon-spec)
'font 'mode-icons-octicons-font))
(propertize mode 'display (nth 1 icon-spec) 'face 'mode-icons-octicons
'font 'mode-icons-octicons-font)) 'font 'mode-icons-octicons-font))
((and (stringp (nth 1 icon-spec)) (not (nth 2 icon-spec))) ((and (stringp (nth 1 icon-spec)) (not (nth 2 icon-spec)))
(propertize mode 'display (mode-icons-get-icon-display (nth 1 icon-spec) (nth 2 icon-spec)))) (propertize mode 'display (mode-icons-get-icon-display (nth 1 icon-spec) (nth 2 icon-spec))))
@ -227,6 +229,10 @@ ICON-SPEC should be a specification from `mode-icons'."
mode-name))))))))) mode-name)))))))))
(force-mode-line-update)) (force-mode-line-update))
(defun mode-icons--generate-major-mode-item ()
"Give rich strings needed for `major-mode' viewing."
(eval `(propertize ,mode-name ,@mode-icons-major-mode-base-text-properties)))
(defun mode-icons--generate-minor-mode-list () (defun mode-icons--generate-minor-mode-list ()
"Extracts all rich strings necessary for the minor mode list." "Extracts all rich strings necessary for the minor mode list."
(delete " " (delete "" (mapcar (lambda(mode) (delete " " (delete "" (mapcar (lambda(mode)
@ -239,6 +245,11 @@ ICON-SPEC should be a specification from `mode-icons'."
'(:eval (mode-icons--generate-minor-mode-list)) '(:eval (mode-icons--generate-minor-mode-list))
"Construct used to replace `minor-mode-alist'.") "Construct used to replace `minor-mode-alist'.")
(defvar mode-icons--major-backup-construct nil)
(defvar mode-icons--major-construct
'(:eval (mode-icons--generate-major-mode-item))
"Construct used to replace `mode-name'.")
(defun mode-icons-fix (&optional enable) (defun mode-icons-fix (&optional enable)
"Fix mode-icons." "Fix mode-icons."
(if enable (if enable
@ -247,13 +258,25 @@ ICON-SPEC should be a specification from `mode-icons'."
(lambda (x) (and (listp x) (lambda (x) (and (listp x)
(equal (car x) :propertize) (equal (car x) :propertize)
(equal (cadr x) '("" minor-mode-alist)))) (equal (cadr x) '("" minor-mode-alist))))
mode-line-modes)))) mode-line-modes)))
(place-major (cl-member-if
(lambda(x)
(and (listp x)
(equal (car x) :propertize)
(equal (cadr x) '("" mode-name))))
mode-line-modes)))
(when place (when place
(setq mode-icons--backup-construct (car place)) (setq mode-icons--backup-construct (car place))
(setcar place mode-icons--mode-line-construct))) (setcar place mode-icons--mode-line-construct))
(let ((place (member mode-icons--mode-line-construct mode-line-modes))) (when place-major
(setq mode-icons--major-backup-construct (car place-major))
(setcar place-major mode-icons--major-construct)))
(let ((place (member mode-icons--mode-line-construct mode-line-modes))
(place-major (member mode-icons--major-backup-construct mode-line-modes)))
(when place (when place
(setcar place mode-icons--backup-construct))))) (setcar place mode-icons--backup-construct))
(when place-major
(setcar place-major mode-icons--major-backup-construct)))))
;;;###autoload ;;;###autoload
(define-minor-mode mode-icons-mode (define-minor-mode mode-icons-mode