X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop10scorescreen.cpp;h=2ac1cb0444afb58ff896270e71ddc4cfcdc25a29;hb=24f41f070f831124d49a371829c44183dcbc6812;hp=a024e9878d3cf3708d635b2550ba08a26491d996;hpb=c9cf3358a292d988d5d50819bb2db4da3347284a;p=ccbs diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp index a024e98..2ac1cb0 100644 --- a/bigscreen/top10scorescreen.cpp +++ b/bigscreen/top10scorescreen.cpp @@ -66,32 +66,43 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height) unsigned row = 1, y = 140; for (std::vector::const_iterator i = scores.begin(); i != scores.end(); ++i) { + std::string suffix; + if (row % 2 == 1) { + suffix = ".odd"; + } else { + suffix = ".even"; + } + char str[16]; - std::string theme_element = "data"; - std::string heading_theme_element = "rowheading"; + std::string heading_theme_element = "top10scores.rowheading" + suffix; + std::string nick_theme_element = "top10scores.nick" + suffix; + std::string songname_theme_element = "top10scores.songname" + suffix; + std::string frequency_theme_element = "top10scores.frequency" + suffix; // print new entries in red if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) { - theme_element = "freshdata"; - heading_theme_element = "freshrowheading"; + heading_theme_element = "top10scores.freshrowheading" + suffix; + nick_theme_element = "top10scores.freshnick" + suffix; + songname_theme_element = "top10scores.freshsongname" + suffix; + frequency_theme_element = "top10scores.freshfrequency" + suffix; } std::sprintf(str, "%u", row++); unsigned width = my_draw_text(str, NULL, 24.0, heading_theme_element); my_draw_text(str, buf, 24.0, heading_theme_element, RANK_X - width/2, y); - my_draw_text(i->nick, buf, 24.0, theme_element, PLAYER_X, y); + my_draw_text(i->nick, buf, 24.0, nick_theme_element, PLAYER_X, y); - if (my_draw_text(i->title, NULL, 24.0, theme_element) > SONG_MAX_WIDTH && + if (my_draw_text(i->title, NULL, 24.0, songname_theme_element) > SONG_MAX_WIDTH && !i->shorttitle.empty()) { - my_draw_text(i->shorttitle, buf, 24.0, theme_element, SONG_X, y); + my_draw_text(i->shorttitle, buf, 24.0, songname_theme_element, SONG_X, y); } else { - my_draw_text(i->title, buf, 24.0, theme_element, SONG_X, y); + my_draw_text(i->title, buf, 24.0, songname_theme_element, SONG_X, y); } std::sprintf(str, "%u", i->score); - width = my_draw_text(str, NULL, 24.0, theme_element); - my_draw_text(str, buf, 24.0, theme_element, SCORE_X - width/2, y); + width = my_draw_text(str, NULL, 24.0, frequency_theme_element); + my_draw_text(str, buf, 24.0, frequency_theme_element, SCORE_X - width/2, y); y += 40; }