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