From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 20 Feb 2005 19:05:49 +0000 (+0000)
Subject: Allow a mix of long and short names in the display of the chosen songs.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=1c6ee3e8264d2d8d03f470a5781cb8c774336af1

Allow a mix of long and short names in the display of the chosen songs.
---

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);
 			}