X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=d4174574d67baf6ffb29c454428be6fa58433275;hp=92618f5cf395760cf28ff230e667441d907e22ec;hb=50753f7c1244d9deebe5b31b19953c5503c8f7b9;hpb=cad5aff5a3a21bb8c95d8a265e93687234f46a43 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 92618f5..d417457 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -81,6 +81,14 @@ void GroupScreen::draw_column_headings(std::vector &td, const Group & unsigned col = 1; unsigned x = 40 + colwidth[0]; for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { + if (!i->chosen) { + unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0, "columnheading"); + my_draw_text_deferred(td, i->song.short_title, 12.0, "columnheading", "columnheading", x + colwidth[col] / 2 - this_width / 2, 100); + } + x += colwidth[col] + 20; + } + + if (num_scores > 1) { unsigned this_width = my_draw_text("Total", NULL, 12.0, "columnheading"); my_draw_text_deferred(td, "Total", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 1] / 2 - this_width / 2, 100); x += colwidth[num_scores + 1] + 20; @@ -119,7 +127,7 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un unsigned this_width = my_draw_text(text, NULL, 22.0, "score" + suffix); if (j->chosen) { - my_draw_text_deferred(td, text, 22.0, "chosensongname" + suffix, "freshchosensongname" + suffix, x + max_num_width - this_width, y); + my_draw_text_deferred(td, text, 22.0, "score" + suffix, "freshscore" + suffix, x + max_num_width - this_width, y); // draw the long name if we can, otherwise use the short one if (my_draw_text(j->song.title, NULL, 12.0, "chosensongname") > (colwidth[col] - 10 - max_num_width)) {