X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop10scorescreen.cpp;h=2ac1cb0444afb58ff896270e71ddc4cfcdc25a29;hb=92cf5ad4caee6d0fe35a23107a451797d502707d;hp=f756447243dee4f49f69a9992726a81ea6770d07;hpb=2a8124ea635c8419ec89876add39535bb6f8f446;p=ccbs

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index f756447..2ac1cb0 100644
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -4,6 +4,7 @@
 #include "resolution.h"
 #include "top10scorescreen.h"
 #include "fonts.h"
+#include "theme.h"
 
 #define RANK_X 30
 #define PLAYER_X 70
@@ -26,6 +27,7 @@ bool Top10ScoreScreen::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<TopScore> scores;
@@ -33,17 +35,18 @@ bool Top10ScoreScreen::check_invalidated()
 	
 	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
 		if (seen_topscore.count(*i) == 0) {
+			valid = false;
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
 void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	memset(buf, 0, width * height * 4);
+	fill_background(buf, "top10scorescreen", width, height);
 	set_screen_size(width, height);
 
 	// fetch the top 10 scores
@@ -51,41 +54,55 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 	conn.perform(FetchTopScoresForTournament(tournament, 10, &scores));
 
 	{
-		unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
-		my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+		unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0, "mainheading");
+		my_draw_text("Today's top 10 scores", buf, 40.0, "mainheading", LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
 	}
 
 	// simple headings
-	my_draw_text("Player", buf, 12.0, PLAYER_X, 100);
-	my_draw_text("Song", buf, 12.0, SONG_X, 100);
-	my_draw_text("Score", buf, 12.0, SCORE_X - 18, 100);
+	my_draw_text("Player", buf, 12.0, "columnheading", PLAYER_X, 100);
+	my_draw_text("Song", buf, 12.0, "columnheading", SONG_X, 100);
+	width = my_draw_text("Score", NULL, 12.0, "columnheading");
+	my_draw_text("Score", buf, 12.0, "columnheading", SCORE_X - width/2, 100);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+		std::string suffix;
+		if (row % 2 == 1) {
+			suffix = ".odd";
+		} else {
+			suffix = ".even";
+		}
+
 		char str[16];
-		unsigned r = 255, g = 255, b = 255;
+		std::string heading_theme_element = "top10scores.rowheading" + suffix;
+		std::string nick_theme_element = "top10scores.nick" + suffix;
+		std::string songname_theme_element = "top10scores.songname" + suffix;
+		std::string frequency_theme_element = "top10scores.frequency" + suffix;
 
 		// print new entries in red
 		if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) {
-			g = b = 0;
+			heading_theme_element = "top10scores.freshrowheading" + suffix;
+			nick_theme_element = "top10scores.freshnick" + suffix;
+			songname_theme_element = "top10scores.freshsongname" + suffix;
+			frequency_theme_element = "top10scores.freshfrequency" + suffix;
 		}
 
 		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);
 
-		my_draw_text(i->nick, buf, 24.0, PLAYER_X, y, r, g, b);
+		my_draw_text(i->nick, buf, 24.0, nick_theme_element, PLAYER_X, y);
 
-		if (my_draw_text(i->title, NULL, 24.0) > SONG_MAX_WIDTH &&
+		if (my_draw_text(i->title, NULL, 24.0, songname_theme_element) > SONG_MAX_WIDTH &&
 		    !i->shorttitle.empty()) {
-			my_draw_text(i->shorttitle, buf, 24.0, SONG_X, y, r, g, b);
+			my_draw_text(i->shorttitle, buf, 24.0, songname_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, songname_theme_element, SONG_X, y);
 		}
 		
 		std::sprintf(str, "%u", i->score);
-		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, SCORE_X - width/2, y, r, g, b);
+		width = my_draw_text(str, NULL, 24.0, frequency_theme_element);
+		my_draw_text(str, buf, 24.0, frequency_theme_element, SCORE_X - width/2, y);
 
 		y += 40;
 	}