X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=ff8cbace21439de9f30bf83844f0c2c7e023d3f8;hp=5e448ac12e6a8932624cab35cc0d5c5c3e10dda6;hb=6cd673299df1e8eaabdf6e538b19dc617514c82a;hpb=c9af9704672c1ee6eeb679ab2ddb0b2de00c2762 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 5e448ac..ff8cbac 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -44,7 +44,7 @@ void GroupScreen::draw(unsigned char *buf) width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0) + max_num_width + 10); } else { - width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0)); + width[col] = std::max(width[col], my_draw_text(j->song.short_title, NULL, 12.0)); width[col] = std::max(width[col], max_num_width); } } @@ -53,8 +53,10 @@ void GroupScreen::draw(unsigned char *buf) // make column headings from the first player's songs unsigned col = 1, x = 40 + width[0]; for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { - if (!i->chosen) - my_draw_text(i->song.title, buf, 12.0, x, 30); + if (!i->chosen) { + unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0); + my_draw_text(i->song.short_title, buf, 12.0, x + width[col] / 2 - this_width / 2, 30); + } x += width[col] + 20; }