X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop5chosenscreen.cpp;h=13cc0b911aeb69029fb816b9642b6fb98ee3ff72;hb=ba36fcef2279cda6e700e47edf16254e1f4e0e6a;hp=321005c049fdd67341d2904e31d8a9aa09f353b8;hpb=9c22e166f4d25f2d80766de9baab56efd9d952b0;p=ccbs

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 321005c..13cc0b9 100644
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -5,6 +5,11 @@
 #include "top5chosenscreen.h"
 #include "fonts.h"
 
+#define RANK_X 30
+#define SONG_X 70
+#define FREQUENCY_X (LOGICAL_SCREEN_WIDTH - 55)
+#define SONG_MAX_WIDTH (LOGICAL_SCREEN_WIDTH - 190)
+
 Top5ChosenScreen::Top5ChosenScreen(pqxx::connection &conn, unsigned tournament)
 	: conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
 {
@@ -34,10 +39,11 @@ bool Top5ChosenScreen::check_invalidated()
 	return false;
 }
 
-void Top5ChosenScreen::draw(unsigned char *buf)
+void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	memset(buf, 0, SCREEN_WIDTH * SCREEN_HEIGHT * 4);
+	memset(buf, 0, width * height * 4);
+	set_screen_size(width, height);
 
 	// fetch the top 5 chosen songs
 	std::vector<TopChosen> scores;
@@ -45,12 +51,12 @@ void Top5ChosenScreen::draw(unsigned char *buf)
 
 	{
 		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, SCREEN_WIDTH/2 - width/2, 60);
+		my_draw_text("Today's top 5 chosen songs", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
 	}
 
 	// simple headings
-	my_draw_text("Song", buf, 12.0, 70, 100);
-	my_draw_text("Frequency", buf, 12.0, 710, 100);
+	my_draw_text("Song", buf, 12.0, SONG_X, 100);
+	my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - 35, 100);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
@@ -64,17 +70,17 @@ void Top5ChosenScreen::draw(unsigned char *buf)
 
 		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);
 
-		if (my_draw_text(i->title, NULL, 24.0) > 610) {
-			my_draw_text(i->shorttitle, buf, 24.0, 70, y, r, g, b);
+		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);
 		} else {
-			my_draw_text(i->title, buf, 24.0, 70, y, r, g, b);
+			my_draw_text(i->title, buf, 24.0, SONG_X, y, r, g, b);
 		}
 		
 		std::sprintf(str, "%u", i->frequency);
 		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 745 - width/2, y, r, g, b);
+		my_draw_text(str, buf, 24.0, FREQUENCY_X - width/2, y, r, g, b);
 
 		y += 40;
 	}