From 2a8124ea635c8419ec89876add39535bb6f8f446 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 18 Feb 2012 12:49:29 +0100 Subject: [PATCH 1/1] Prepare top 10 score screen for widescreen. --- bigscreen/top10scorescreen.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp index b687698..f756447 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) { @@ -50,9 +56,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, 370, 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::const_iterator i = scores.begin(); i != scores.end(); ++i) { @@ -66,20 +72,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) > 320 && + if (my_draw_text(i->title, NULL, 24.0) > SONG_MAX_WIDTH && !i->shorttitle.empty()) { - my_draw_text(i->shorttitle, buf, 24.0, 370, y, r, g, b); + my_draw_text(i->shorttitle, buf, 24.0, SONG_X, y, r, g, b); } else { - my_draw_text(i->title, buf, 24.0, 370, 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; } -- 2.39.5