Show songs next to each chosen song, and center the appropriate scores. Also, check...

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 86ff4672e97d58518156d9838dde9b5c73e83020..596905b116cfcffb5c9c5a9b7c65407ec250259b 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -33,6 +33,8 @@ void GroupScreen::draw(unsigned char *buf)
        for (unsigned i = 0; i < 16; ++i)
                width[i] = 0;
 
+       unsigned max_num_width = my_draw_text("88888", NULL, 0, 0, false, 0, 0, 0);
+
        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
                width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 0, 0, false, 0, 0, 0));
 
@@ -40,10 +42,10 @@ void GroupScreen::draw(unsigned char *buf)
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                        if (j->chosen) {
                                width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0) + 
-                                                                 my_draw_text("8888", NULL, 0, 0, false, 0, 0, 0) + 10);
+                                                                 max_num_width + 10);
                        } else {                
                                width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0));
-                               width[col] = std::max(width[col], my_draw_text("8888", NULL, 0, 0, false, 0, 0, 0));
+                               width[col] = std::max(width[col], max_num_width);
                        }
                }
        }       
@@ -67,9 +69,17 @@ void GroupScreen::draw(unsigned char *buf)
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                        char text[16];
                        sprintf(text, "%u", j->score);
-                       
-                       if (j->score != -1) {
-                               my_draw_text(text, buf, x, y, true, 255, 255, 255);
+       
+                       unsigned this_width = my_draw_text(text, buf, 0, 0, false, 0, 0, 0);
+                       if (j->chosen) {
+                               if (j->score != -1) {
+                                       my_draw_text(text, buf, x + max_num_width - this_width, y, true, 255, 255, 255);
+                               }
+                               my_draw_text(j->song.title, buf, x + max_num_width + 10, y, true, 255, 255, 255);
+                       } else {
+                               if (j->score != -1) {
+                                       my_draw_text(text, buf, x + width[col] / 2 - this_width / 2, y, true, 255, 255, 255);
+                               }
                        }
                        x += width[col] + 20;
                }