X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop10scorescreen.cpp;h=672a906d9fd5261e011f58ec60beb8384c208304;hb=6bd21f38c6a860ba75ea98f2404c83d9bd55498a;hp=c298dbb3a4359a86a7371808cb616514c6e8ad3f;hpb=09ae4d8636130d4c86ab3f8df8f823482f948f97;p=ccbs

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index c298dbb..672a906 100644
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -5,6 +5,12 @@
 #include "top10scorescreen.h"
 #include "fonts.h"
 
+#define RANK_X 30
+#define PLAYER_X 70
+#define SONG_X 370
+#define SCORE_X (LOGICAL_SCREEN_WIDTH - 72)
+#define SONG_MAX_WIDTH (LOGICAL_SCREEN_WIDTH - 480)
+
 Top10ScoreScreen::Top10ScoreScreen(pqxx::connection &conn, unsigned tournament)
 	: conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
 {
@@ -20,6 +26,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;
@@ -27,10 +34,11 @@ 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;
 }
 
@@ -50,9 +58,9 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 	}
 
 	// simple headings
-	my_draw_text("Player", buf, 12.0, 70, 100);
-	my_draw_text("Song", buf, 12.0, 250, 100);
-	my_draw_text("Score", buf, 12.0, 710, 100);
+	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);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
@@ -66,19 +74,20 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 
 		std::sprintf(str, "%u", row++);
 		unsigned width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 30 - width/2, y);
+		my_draw_text(str, buf, 24.0, RANK_X - width/2, y);
 
-		my_draw_text(i->nick, buf, 24.0, 70, y, r, g, b);
+		my_draw_text(i->nick, buf, 24.0, PLAYER_X, y, r, g, b);
 
-		if (my_draw_text(i->title, NULL, 24.0) > 430) {
-			my_draw_text(i->shorttitle, buf, 24.0, 250, y, r, g, b);
+		if (my_draw_text(i->title, NULL, 24.0) > SONG_MAX_WIDTH &&
+		    !i->shorttitle.empty()) {
+			my_draw_text(i->shorttitle, buf, 24.0, SONG_X, y, r, g, b);
 		} else {
-			my_draw_text(i->title, buf, 24.0, 250, y, r, g, b);
+			my_draw_text(i->title, buf, 24.0, SONG_X, y, r, g, b);
 		}
 		
 		std::sprintf(str, "%u", i->score);
 		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 728 - width/2, y, r, g, b);
+		my_draw_text(str, buf, 24.0, SCORE_X - width/2, y, r, g, b);
 
 		y += 40;
 	}