Merge pull request #1830 from rexendevar/auto-theme-contrast

improve lyrics contrast with auto theme enabled

Author: Taiko2k

src/tauon/t_modules/t_main.py

@@ -19693,7 +19693,7 @@ def test_update(self, track_object: TrackClass) -> None:
 
 	def render(self, x: int, y: int, w: int, h: int, p: int) -> None:
 		colour = self.colours.lyrics
-		bg = self.colours.playlist_panel_background
+		bg = self.colours.lyrics_panel_background
 
 		#colour = self.colours.grey(40)
 		# if test_lumi(self.colours.lyrics_panel_background) < 0.5:
@@ -19853,7 +19853,7 @@ def render(self, index: int, x: int, y: int, side_panel: bool = False, w: int =
 			y_center = y + (h/2) - (spacing)
 		else:
 			scroll_to = 0
-			bg = self.colours.playlist_panel_background
+			bg = self.colours.lyrics_panel_background
 			font_size = 20
 			spacing = round(10 * self.gui.scale)
 			y_center = self.window_size[1]/2
@@ -21604,9 +21604,7 @@ def display(self, track: TrackClass, location: list[int], box: tuple[int, int],
 						x_colours.append(ColourRGBA(colour[0], colour[1], colour[2], 255))
 
 				#logging.info(x_colours)
-				colours.playlist_panel_bg = colours.side_panel_background
 				colours.playlist_box_background = colours.side_panel_background
-				colours.lyrics_panel_background = colours.side_panel_background
 
 				colours.playlist_panel_background = x_colours[0]
 				if len(x_colours) > 1:
@@ -21622,6 +21620,7 @@ def display(self, track: TrackClass, location: list[int], box: tuple[int, int],
 								colours.playlist_box_background = x_colours[4]
 
 				colours.queue_background = colours.side_panel_background
+				colours.lyrics_panel_background = colours.side_panel_background
 				# Check artist text colour
 				if contrast_ratio(colours.artist_text, colours.playlist_panel_background) < 1.9:
 					black = ColourRGBA(25, 25, 25, 255)
@@ -21652,6 +21651,36 @@ def display(self, track: TrackClass, location: list[int], box: tuple[int, int],
 					colours.title_text = choice
 					colours.title_playing = choice
 
+				# Check lyrics text colour
+				if contrast_ratio(colours.lyrics, colours.lyrics_panel_background) < 1.9:
+					black = ColourRGBA(60, 60, 60, 255)
+					white = ColourRGBA(180, 180, 180, 255)
+
+					con_b = contrast_ratio(black, colours.lyrics_panel_background)
+					con_w = contrast_ratio(white, colours.lyrics_panel_background)
+
+					choice = black
+					if con_w > con_b:
+						choice = white
+
+					colours.lyrics = choice
+
+				# try to pick high-contrast active lyric color
+				contrast = 0
+				for i in x_colours:
+					temp = contrast_ratio(i, colours.lyrics_panel_background)
+					if temp > contrast:
+						colours.active_lyric = i
+						contrast = temp
+				# if there isn't one, just do full black/white
+				if contrast_ratio(colours.active_lyric, colours.lyrics_panel_background) < 2.9 or contrast_ratio(colours.active_lyric, colours.lyrics) < 1.9:
+					lpb = colours.lyrics_panel_background
+					lr  = colours.lyrics
+					tc = rgb_to_hls(lpb.r, lpb.g, lpb.b)
+					lc = rgb_to_hls(lr.r,  lr.g,  lr.b)
+
+					colours.active_lyric = hls_to_rgb( tc[0]+0.3, lc[1], max(tc[2]*1.5, 0.5) )
+
 				if test_lumi(colours.side_panel_background) < 0.50 and not self.prefs.transparent_mode:
 					colours.side_bar_line1 = ColourRGBA(25, 25, 25, 255)
 					colours.side_bar_line2 = ColourRGBA(35, 35, 35, 255)
@@ -35799,8 +35828,8 @@ def render(self) -> None:
 		elif self.window_size[1] / self.window_size[0] > 0.7:
 			x = int(self.window_size[0] * 0.07)
 
-		bbg = rgb_add_hls(self.colours.playlist_panel_background, 0, 0.05, 0)  # [255, 255, 255, 18]
-		bfg = rgb_add_hls(self.colours.playlist_panel_background, 0, 0.09, 0)  # [255, 255, 255, 30]
+		bbg = rgb_add_hls(self.colours.lyrics_panel_background, 0, 0.05, 0)  # [255, 255, 255, 18]
+		bfg = rgb_add_hls(self.colours.lyrics_panel_background, 0, 0.09, 0)  # [255, 255, 255, 30]
 		bft = self.colours.grey(235)
 		bbt = self.colours.grey(200)
 
@@ -35819,12 +35848,12 @@ def render(self) -> None:
 			bft = ColourRGBA(255, 255, 255, 250)
 			bbt = ColourRGBA(255, 255, 255, 200)
 
-		if test_lumi(self.colours.playlist_panel_background) < 0.7:
+		if test_lumi(self.colours.lyrics_panel_background) < 0.7:
 			light_mode = True
 			t1 = self.colours.grey(30)
 			self.gui.vis_4_colour = ColourRGBA(40, 40, 40, 255)
 
-		self.ddt.rect((0, self.gui.panelY, self.window_size[0], self.window_size[1] - self.gui.panelY), self.colours.playlist_panel_background)
+		self.ddt.rect((0, self.gui.panelY, self.window_size[0], self.window_size[1] - self.gui.panelY), self.colours.lyrics_panel_background)
 
 		if self.prefs.bg_showcase_only and self.prefs.art_bg:
 			self.tauon.style_overlay.display()
@@ -37838,7 +37867,7 @@ def synced_render(self, index: int, x: int, y: int, hide_art: bool = False, w: i
 		highlight = True
 
 		scroll_to = 0
-		bg = self.colours.playlist_panel_background
+		bg = self.colours.lyrics_panel_background
 		spacing = round(10 * self.gui.scale)
 		y_center = self.window_size[1]/2
 
@@ -38205,7 +38234,7 @@ def is_int(number: str) -> bool:
 
 	def unsynced_render(self, x: int, y: float, box: float, hide_art: bool) -> None:
 		colour = self.colours.lyrics
-		bg = self.colours.playlist_panel_background
+		bg = self.colours.lyrics_panel_background
 
 
 		x += box + int(self.window_size[0] * 0.15) + 10 * self.gui.scale
@@ -38382,8 +38411,8 @@ def render(self) -> None:
 		elif self.window_size[1] / self.window_size[0] > 0.7:
 			x = int(self.window_size[0] * 0.07)
 
-		bbg = rgb_add_hls(self.colours.playlist_panel_background, 0, 0.05, 0)  # [255, 255, 255, 18]
-		bfg = rgb_add_hls(self.colours.playlist_panel_background, 0, 0.09, 0)  # [255, 255, 255, 30]
+		bbg = rgb_add_hls(self.colours.lyrics_panel_background, 0, 0.05, 0)  # [255, 255, 255, 18]
+		bfg = rgb_add_hls(self.colours.lyrics_panel_background, 0, 0.09, 0)  # [255, 255, 255, 30]
 		bft = self.colours.grey(235)
 		bbt = self.colours.grey(200)
 
@@ -38402,12 +38431,12 @@ def render(self) -> None:
 			bft = ColourRGBA(255, 255, 255, 250)
 			bbt = ColourRGBA(255, 255, 255, 200)
 
-		if test_lumi(self.colours.playlist_panel_background) < 0.7:
+		if test_lumi(self.colours.lyrics_panel_background) < 0.7:
 			light_mode = True
 			t1 = self.colours.grey(30)
 			self.gui.vis_4_colour = ColourRGBA(40, 40, 40, 255)
 
-		self.ddt.rect((0, self.gui.panelY, self.window_size[0], self.window_size[1] - self.gui.panelY), self.colours.playlist_panel_background)
+		self.ddt.rect((0, self.gui.panelY, self.window_size[0], self.window_size[1] - self.gui.panelY), self.colours.lyrics_panel_background)
 
 		if self.prefs.bg_showcase_only and self.prefs.art_bg:
 			self.tauon.style_overlay.display()