X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ftop5chosenscreen.cpp;fp=bigscreen%2Ftop5chosenscreen.cpp;h=57a54f0a20833e77634110c77ce3a50e5375c9d7;hp=3f50f82d121095e42c0bdc941f09b62564207133;hb=bbbf0f34d43aa3b6f43225fb6c2d45566a423ab1;hpb=d4ec885cadcbcce077579bdd24c93ead18b06852

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 3f50f82..57a54f0 100644
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -4,6 +4,7 @@
 #include "resolution.h"
 #include "top5chosenscreen.h"
 #include "fonts.h"
+#include "theme.h"
 
 #define RANK_X 30
 #define SONG_X 70
@@ -44,13 +45,7 @@ bool Top5ChosenScreen::check_invalidated()
 void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	unsigned char *ptr = buf;
-	for (unsigned i = 0; i < width * height; ++i) {
-		*ptr++ = BACKGROUND_BLUE;
-		*ptr++ = BACKGROUND_GREEN;
-		*ptr++ = BACKGROUND_RED;
-		*ptr++ = 0;
-	}
+	fill_background(buf, width, height);
 	set_screen_size(width, height);
 
 	// fetch the top 5 chosen songs
@@ -58,40 +53,40 @@ void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 	conn.perform(FetchTopChosenSongsForTournament(tournament, 5, &scores));
 
 	{
-		unsigned width = my_draw_text("Today's top 5 chosen songs", NULL, 40.0);
-		my_draw_text("Today's top 5 chosen songs", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60, MAIN_HEADING_RED, MAIN_HEADING_GREEN, MAIN_HEADING_BLUE);
+		unsigned width = my_draw_text("Today's top 5 chosen songs", NULL, 40.0, "mainheading");
+		my_draw_text("Today's top 5 chosen songs", buf, 40.0, "mainheading", LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
 	}
 
 	// simple headings
-	my_draw_text("Song", buf, 12.0, SONG_X, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
-	width = my_draw_text("Frequency", NULL, 12.0);
-	my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - width/2, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
+	my_draw_text("Song", buf, 12.0, "columnheading", SONG_X, 100);
+	width = my_draw_text("Frequency", NULL, 12.0, "columnheading");
+	my_draw_text("Frequency", buf, 12.0, "columnheading", FREQUENCY_X - width/2, 100);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
 		char str[16];
-		unsigned r = DATA_RED, g = DATA_GREEN, b = DATA_BLUE, rh = ROW_HEADING_RED, gh = ROW_HEADING_GREEN, bh = ROW_HEADING_BLUE;
+		std::string theme_element = "data";
+		std::string heading_theme_element = "rowheading";
 
 		// print new entries in red
 		if (seen_topchosen.count(*i) == 0 && seen_topchosen.size() > 0) {
-			r = rh = FRESH_DATA_RED;
-			g = gh = FRESH_DATA_GREEN;
-			b = bh = FRESH_DATA_BLUE;
+			theme_element = "freshdata";
+			heading_theme_element = "freshrowheading";
 		}
 
 		std::sprintf(str, "%u", row++);
-		unsigned width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, RANK_X - width/2, y, rh, gh, bh);
+		unsigned width = my_draw_text(str, NULL, 24.0, heading_theme_element);
+		my_draw_text(str, buf, 24.0, heading_theme_element, RANK_X - width/2, y);
 
-		if (my_draw_text(i->title, NULL, 24.0) > SONG_MAX_WIDTH) {
-			my_draw_text(i->shorttitle, buf, 24.0, SONG_X, y, r, g, b);
+		if (my_draw_text(i->title, NULL, 24.0, theme_element) > SONG_MAX_WIDTH) {
+			my_draw_text(i->shorttitle, buf, 24.0, theme_element, SONG_X, y);
 		} else {
-			my_draw_text(i->title, buf, 24.0, SONG_X, y, r, g, b);
+			my_draw_text(i->title, buf, 24.0, theme_element, SONG_X, y);
 		}
 		
 		std::sprintf(str, "%u", i->frequency);
-		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, FREQUENCY_X - width/2, y, r, g, b);
+		width = my_draw_text(str, NULL, 24.0, theme_element);
+		my_draw_text(str, buf, 24.0, theme_element, FREQUENCY_X - width/2, y);
 
 		y += 40;
 	}