X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=ff8cbace21439de9f30bf83844f0c2c7e023d3f8;hp=86ff4672e97d58518156d9838dde9b5c73e83020;hb=6cd673299df1e8eaabdf6e538b19dc617514c82a;hpb=e7b4a93b19eb80023d2b58d36c8255f589e36d2d

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 86ff467..ff8cbac 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -33,17 +33,19 @@ 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, 22.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));
+		width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
 
 		unsigned col = 1;
 		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);
+				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, 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], my_draw_text(j->song.short_title, NULL, 12.0));
+				width[col] = std::max(width[col], max_num_width);
 			}
 		}
 	}	
@@ -51,15 +53,17 @@ 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<Score>::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, x, 30, true, 255, 255, 255);
+		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;
 	}
 	
 	// show all the players and the scores
-	unsigned y = 50;
+	unsigned y = 70;
 	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-		my_draw_text(i->nick, buf, 20, y, true, 255, 255, 255);
+		my_draw_text(i->nick, buf, 18.0, 20, y);
 
 		unsigned x = 40 + width[0];
 
@@ -67,14 +71,22 @@ 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, NULL, 22.0);
+			if (j->chosen) {
+				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);
+			} else {
+				if (j->score != -1) {
+					my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
+				}
 			}
 			x += width[col] + 20;
 		}
 
-		y += 20;
+		y += 40;
 	}
 	
 	valid = true;