Skip to content

Commit

Permalink
[Core] Don't set default-button category so as not use button-map.
Browse files Browse the repository at this point in the history 
Fixes #1052
  • Loading branch information
@Alexander-Miller
Alexander-Miller committed Nov 7, 2023
1 parent 92e173b commit 45de11a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions src/elisp/treemacs-extensions.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ node for quick retrieval later."
,icon
(propertize ,label-form
'button '(t)
'category 'default-button
'category t
,@(when face `((quote face) ,face))
:custom t
:state ,state
Expand Down Expand Up @@ -445,7 +445,7 @@ additional keys."
,(if icon-closed closed-icon-name icon-closed-form)
(propertize ,root-label
'button '(t)
'category 'default-button
'category t
'face ,root-face
:custom t
:key ,root-key-form
Expand Down Expand Up @@ -480,7 +480,7 @@ additional keys."
(treemacs-dom-node->insert-into-dom! dom-node)
(insert (propertize "Hidden Node\n"
'button '(t)
'category 'default-button
'category t
'invisible t
'skip t
:custom t
Expand All @@ -503,7 +503,7 @@ additional keys."
(insert ,(if icon-closed closed-icon-name icon-closed-form))
(insert (propertize ,root-label
'button '(t)
'category 'default-button
'category t
'face ,root-face
:custom t
:key ,root-key-form
Expand Down
6 changes: 3 additions & 3 deletions src/elisp/treemacs-rendering.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ DEPTH indicates how deep in the filetree the current button is."
(treemacs-icon-for-dir dir-name 'closed)
(propertize (->> dir-name (funcall treemacs-directory-name-transformer))
'button '(t)
'category 'default-button
'category t
'help-echo nil
'keymap nil
:default-face 'treemacs-directory-face
Expand All @@ -261,7 +261,7 @@ DEPTH indicates how deep in the filetree the current button is."
(treemacs-icon-for-file ,path)
(propertize (->> ,path file-name-nondirectory (funcall treemacs-file-name-transformer))
'button '(t)
'category 'default-button
'category t
'help-echo nil
'keymap nil
:default-face 'treemacs-git-unmodified-face
Expand Down Expand Up @@ -711,7 +711,7 @@ PROJECT: Project Struct"
(insert
(propertize (treemacs-project->name project)
'button '(t)
'category 'default-button
'category t
'face (treemacs--root-face project)
:project project
:default-face 'treemacs-root-face
Expand Down
4 changes: 2 additions & 2 deletions src/elisp/treemacs-tags.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ DEPTH: Int"
,prefix
(propertize (car ,item)
'button '(t)
'category 'default-button
'category t
'face 'treemacs-tags-face
'help-echo nil
:path ,path
Expand All @@ -171,7 +171,7 @@ DEPTH: Int"
,prefix
(propertize (car ,node)
'button '(t)
'category 'default-button
'category t
'face 'treemacs-tags-face
'help-echo nil
:path ,path
Expand Down
8 changes: 4 additions & 4 deletions src/elisp/treemacs-treelib.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ EXT: `treemacs-extension' instance"
(insert (propertize
label
'button '(t)
'category 'default-button
'category t
:custom t
:key key
:path key
Expand Down Expand Up @@ -614,7 +614,7 @@ EXPAND-DEPTH: Int"
(treemacs-dom-node->insert-into-dom! dom-node)
(insert (propertize "Hidden node"
'button '(t)
'category 'default-button
'category t
'invisible t
'skip t
:custom t
Expand Down Expand Up @@ -665,7 +665,7 @@ LABEL: String"
(apply
#'propertize ,label
'button '(t)
'category 'default-button
'category t
'help-echo nil
:custom t
:state ,state
Expand Down Expand Up @@ -699,7 +699,7 @@ PARENT: Button"
(treemacs-extension->get ext :closed-icon)
(propertize (treemacs-extension->get ext :label)
'button '(t)
'category 'default-button
'category t
:custom t
:key key
:path path
Expand Down

0 comments on commit 45de11a

Please sign in to comment.