Skip to content

Commit

Permalink
Merge pull request dylanaraps#497 from patzm/patzm/feat/alpha_decimal
Browse files Browse the repository at this point in the history
alpha decimal support
  • Loading branch information
dylanaraps authored May 4, 2020
2 parents a2ddff3 + 0b31584 commit eb42008
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
13 changes: 7 additions & 6 deletions pywal/templates/colors-kitty.conf
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
foreground {foreground}
background {background}
cursor {cursor}
foreground {foreground}
background {background}
background_opacity {background.alpha_dec}
cursor {cursor}

active_tab_foreground {background}
active_tab_background {foreground}
inactive_tab_foreground {foreground}
inactive_tab_background {background}

active_border_color {foreground}
inactive_border_color {background}
bell_border_color {color1}
active_border_color {foreground}
inactive_border_color {background}
bell_border_color {color1}

color0 {color0}
color8 {color8}
Expand Down
17 changes: 11 additions & 6 deletions pywal/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,21 @@ def xrgba(self):
def rgba(self):
"""Convert a hex color to rgba."""
return "rgba(%s,%s,%s,%s)" % (*hex_to_rgb(self.hex_color),
int(self.alpha_num) / 100)
self.alpha_dec)

@property
def alpha(self):
"""Add URxvt alpha value to color."""
return "[%s]%s" % (self.alpha_num, self.hex_color)

@property
def alpha_dec(self):
"""Export the alpha value as a decimal number in [0, 1]."""
return int(self.alpha_num) / 100

@property
def octal(self):
"""Export color in octal"""
"""Export color in octal."""
return "%s%s" % ("#", oct(int(self.hex_color[1:], 16))[2:])

@property
Expand Down Expand Up @@ -74,17 +79,17 @@ def blue(self):
return "%.3f" % (hex_to_rgb(self.hex_color)[2]/255.)

def lighten(self, percent):
"""Lighten color by percent"""
"""Lighten color by percent."""
percent = float(re.sub(r'[\D\.]', '', str(percent)))
return Color(lighten_color(self.hex_color, percent / 100))

def darken(self, percent):
"""Darken color by percent"""
"""Darken color by percent."""
percent = float(re.sub(r'[\D\.]', '', str(percent)))
return Color(darken_color(self.hex_color, percent / 100))

def saturate(self, percent):
"""Saturate a color"""
"""Saturate a color."""
percent = float(re.sub(r'[\D\.]', '', str(percent)))
return Color(saturate_color(self.hex_color, percent / 100))

Expand All @@ -103,7 +108,7 @@ def read_file_json(input_file):

def read_file_raw(input_file):
"""Read data from a file as is, don't strip
newlines or other special characters.."""
newlines or other special characters."""
with open(input_file, "r") as file:
return file.readlines()

Expand Down

0 comments on commit eb42008

Please sign in to comment.