Go to short names on chosen songs if the text is too wide.

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 8432bbf321e66fbea4bc846b941856207a349594..5f16ebf22fe98be6766e3a2fc772af2c0cca28da 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -41,31 +41,46 @@ void GroupScreen::draw(unsigned char *buf)
                my_draw_text(heading, buf, 48.0, 800/2 - width/2, 60);
        }
        
                my_draw_text(heading, buf, 48.0, 800/2 - width/2, 60);
        }
        

-       // find out how wide each column has to be
-       unsigned width[16];
-       for (unsigned i = 0; i < 16; ++i)
-               width[i] = 0;
-
+       // Find out how wide each column has to be. First try unlimited width (ie.
+       // long titles for everything); if that gets too long, try again with short
+       // titles for chosen songs.
+       unsigned width[16], num_scores;

        unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
        unsigned max_num_width = my_draw_text("8888", NULL, 22.0);

-       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-               unsigned col = 1;
-               width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
-
-               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, 12.0) + 
-                                                                 max_num_width + 10);
-                       } else {                
-                               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);
+       unsigned mode;
+       for (mode = 0; mode < 2; ++mode) {
+               for (unsigned i = 0; i < 16; ++i)
+                       width[i] = 0;
+
+               for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+                       unsigned col = 1;
+                       width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
+
+                       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((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + 
+                                                       max_num_width + 10);
+                               } else {                
+                                       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);
+                               }

                        }
                }
                        }
                }

-       }

 
 

-       unsigned num_scores = group.players[0].scores.size();
-       
-       width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
-       width[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
+               num_scores = group.players[0].scores.size();
+
+               width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+               width[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
+
+               // if we're at long titles and that works, don't try the short ones
+               if (mode == 0) {
+                       unsigned sumwidth = 0;
+                       for (unsigned i = 0; i <= num_scores + 2; ++i)
+                               sumwidth += width[i] + 20;
+                       
+                       if (sumwidth < 800)
+                               break;
+               }
+       }

 
        // make column headings from the first player's songs
        unsigned col = 1;
 
        // make column headings from the first player's songs
        unsigned col = 1;


@@ -99,7 +114,7 @@ void GroupScreen::draw(unsigned char *buf)
                                if (j->score != -1) {
                                        my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
                                }
                                if (j->score != -1) {
                                        my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
                                }

-                               my_draw_text(j->song.title, buf, 12.0, x + max_num_width + 10, y);
+                               my_draw_text((mode == 0) ? j->song.title : j->song.short_title, buf, 12.0, x + max_num_width + 10, y);

                        } else {
                                if (j->score != -1) {
                                        my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
                        } else {
                                if (j->score != -1) {
                                        my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);