X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop5chosenscreen.cpp;h=57a54f0a20833e77634110c77ce3a50e5375c9d7;hb=40a55879c3ebcefc70e52ad2f573cf0da10d3d73;hp=13cc0b911aeb69029fb816b9642b6fb98ee3ff72;hpb=ba36fcef2279cda6e700e47edf16254e1f4e0e6a;p=ccbs

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 13cc0b9..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
@@ -25,6 +26,7 @@ bool Top5ChosenScreen::check_invalidated()
 		return true;
 	if (!scores_changed.get_flag())
 		return false;
+	scores_changed.reset_flag();
 
 	// check that there are indeed changes, otherwise don't bother
 	std::vector<TopChosen> scores;
@@ -32,6 +34,7 @@ bool Top5ChosenScreen::check_invalidated()
 
 	for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
 		if (seen_topchosen.count(*i) == 0) {
+			valid = false;
 			return true;
 		}       
 	}
@@ -42,7 +45,7 @@ bool Top5ChosenScreen::check_invalidated()
 void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	memset(buf, 0, width * height * 4);
+	fill_background(buf, width, height);
 	set_screen_size(width, height);
 
 	// fetch the top 5 chosen songs
@@ -50,37 +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);
+		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);
-	my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - 35, 100);
+	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 = 255, g = 255, b = 255;
+		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) {
-			g = b = 0;
+			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);
+		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;
 	}