Prepare top 5 chosen screen for widescreen.

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 9057bc14d6161e4a902352f9e1e83266b240c818..13cc0b911aeb69029fb816b9642b6fb98ee3ff72 100644 (file)
--- 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)
 {
@@ -50,8 +55,8 @@ void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
        }
 
        // 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) {
@@ -65,17 +70,17 @@ void Top5ChosenScreen::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);
 
-               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;
        }