Center some headings a bit better.

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 2db7bfd4ecc3c167e309d9c42a20c82db235446a..275a4f5dc998531f1d97dcb8186264cf0b3f841f 100644 (file)
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -1,9 +1,16 @@
 #include <cstdio>
 #include <algorithm>
 
+#include "resolution.h"
 #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)
 {
@@ -19,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;
@@ -26,17 +34,19 @@ 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)
+void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
        scores_changed.reset_flag();
-       memset(buf, 0, 800 * 600 * 4);
+       memset(buf, 0, width * height * 4);
+       set_screen_size(width, height);
 
        // fetch the top 10 scores
        std::vector<TopScore> scores;
@@ -44,13 +54,14 @@ void Top10ScoreScreen::draw(unsigned char *buf)
 
        {
                unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
-               my_draw_text("Today's top 10 scores", buf, 40.0, 800/2 - width/2, 60);
+               my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
        }
 
        // 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);
+       width = my_draw_text("Score", NULL, 12.0);
+       my_draw_text("Score", buf, 12.0, SCORE_X - width/2, 100);
        
        unsigned row = 1, y = 140;
        for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
@@ -64,19 +75,20 @@ void Top10ScoreScreen::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);
 
-               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;
        }
@@ -87,3 +99,7 @@ void Top10ScoreScreen::draw(unsigned char *buf)
        std::copy(scores.begin(), scores.end(), std::inserter(seen_topscore, seen_topscore.end()));
 }
 
+int Top10ScoreScreen::get_priority()
+{
+       return 5;
+}