Center some headings a bit better.

[ccbs] / bigscreen / top5chosenscreen.cpp

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index 84b54ead045fda8663116c6aba09f96346512cc9..5d2e9dc947bbe421897a65e4f2e5d5fda3f1e660 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)
 {
@@ -20,6 +25,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;
@@ -27,6 +33,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;
                }       
        }
@@ -34,10 +41,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;
@@ -49,8 +57,9 @@ void Top5ChosenScreen::draw(unsigned char *buf)
        }
 
        // 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);
+       width = my_draw_text("Frequency", NULL, 12.0);
+       my_draw_text("Frequency", buf, 12.0, FREQUENCY_X - width/2, 100);
        
        unsigned row = 1, y = 140;
        for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
@@ -64,17 +73,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;
        }