Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve color handling #4

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Improve color handling #4

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2c2e279
svg-battery-indicator: Refactor
swflint May 30, 2024
9914b11
Use the a face to determine the stroke color of image elements
swflint May 30, 2024
d8e6d29
Use a customizable face to determine the default fill of the indicator
swflint May 30, 2024
f355f02
Update variable names to be more descriptive
swflint May 30, 2024
9398b5d
Use when instead of "and"
swflint May 30, 2024
531921a
Fix sentence-ending checkdoc errors
swflint May 30, 2024
211e0e0
Write a docstring
swflint May 30, 2024
ad88aa8
Make the lug height relative to the image height
swflint May 30, 2024
2452eeb
Set lug width as 1/10th of the overall length
swflint May 30, 2024
ffc733a
Add some clarifying TODOs
swflint May 30, 2024
806aadc
Make lug width just a bit wider than a stroke
swflint May 30, 2024
23f2645
Use the stroke-width variable instead of a fixed number
swflint May 30, 2024
1e09dbc
Use stroke-width for line placement
swflint May 30, 2024
30bbe6f
Calculate stroke width as a fraction of the base height
swflint May 30, 2024
8e2142d
Convert -face variables to be faces
swflint Jun 29, 2024
44d078b
Enable dynamic calculation of battery size based on status
swflint Oct 4, 2024
b54a651
Add a face for the bolt
swflint Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion svg-battery-indicator.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
:group 'svg-battery-indicator
:type 'face)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do use a face here, I as a user would expect anything called *-face which controls colouring to be a face, not variable pointing at a symbol for a face. So if we do use a face (which again, I'm not sure we should), it should be something more like:

(defface svg-battery-indicator-stroke '((t :inherit mode-line))
  "Face used for battery image borders."
  :group 'svg-battery-indicator)


(defcustom svg-battery-indicator-fill-face 'mode-line-inactive
"Face used to fill battery image based on percent."
:group 'svg-battery-indicator
:type 'face)

(defun svg-battery-indicator--battery (base-height base-length nub-width stroke-width rounding-radius)
"Generate a basic battery SVG."
(let ((svg (svg-create (+ nub-width base-length) base-height
Expand Down Expand Up @@ -89,7 +94,7 @@ CHARGING is non-nil a lightning symbol is drawn over the SVG."
'battery-load-critical)
((<= percentage battery-load-low)
'battery-load-low)
(t 'mode-line))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this idea, but I'm not sure we need to use face.

I used faces for the other colours because I wanted automatic consistency with the standard battery colours, and those are setup as faces. But here, there isn't anything obvious to inherit from. Or in other words: from the users point of view, this is isn't the sort that is usually customised by changing a face. Maybe we should just use a colour value string?

(t svg-battery-indicator-fill-face))
:foreground nil 'inherit)))
;; Fill/percentage rectangle
(let* ((os (* 2 sw))
Expand Down