X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=dacefbcbccc7f64b0992abb4f19bf4f6567b8a4c;hp=cd6c86edccdb596660452a30fbd2096de61ae758;hb=1c6ee3e8264d2d8d03f470a5781cb8c774336af1;hpb=b98b1fca90f6fc812cb3befe5170c5416d7a38f0

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index cd6c86e..dacefbc 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -152,7 +152,13 @@ void GroupScreen::draw(unsigned char *buf)
 			unsigned this_width = my_draw_text(text, NULL, 22.0);
 			if (j->chosen) {
 				my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y);
-				my_draw_text_deferred(td, (mode == 0) ? j->song.title : j->song.short_title, 12.0, x + max_num_width + 10, y);
+
+				// draw the long name if we can, otherwise use the short one
+				if (my_draw_text(j->song.title, NULL, 12.0) > width[col]) {
+					my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y);
+				} else {
+					my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y);
+				}
 			} else {
 				my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y);
 			}