From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 19 Feb 2012 01:42:25 +0000 (+0100)
Subject: Fix column headings; they were broken after a mismerge.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=40af5a0e1275f94fe901733336d690effc0bfc38

Fix column headings; they were broken after a mismerge.
---

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 92618f5..1513ef3 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -81,6 +81,14 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
 	unsigned col = 1;
 	unsigned x = 40 + colwidth[0];
 	for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
+	        if (!i->chosen) {
+	                unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0, "columnheading");
+	                my_draw_text_deferred(td, i->song.short_title, 12.0, "columnheading", "columnheading", x + colwidth[col] / 2 - this_width / 2, 100);
+	        }
+	        x += colwidth[col] + 20;
+	}
+
+	if (num_scores > 1) {
 		unsigned this_width = my_draw_text("Total", NULL, 12.0, "columnheading");
 		my_draw_text_deferred(td, "Total", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 1] / 2 - this_width / 2, 100);
 		x += colwidth[num_scores + 1] + 20;