From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 18 Feb 2012 11:43:59 +0000 (+0100)
Subject: Prepare the group screen for widescreen.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=5f61b3659077f6dc7109aacbc802246c9afaf4dd

Prepare the group screen for widescreen.
---

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index b2a6315..6b2ad3d 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -198,7 +198,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
 		for (unsigned i = 0; i <= num_scores + 2; ++i)
 			sumcolwidth += colwidth[i] + 20;
 		
-		if (sumcolwidth < 780)
+		if (sumcolwidth < LOGICAL_SCREEN_WIDTH - 20)
 			break;
 
 		if (mode == 0) {
@@ -210,7 +210,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
 	 * If we have space to go, distribute as much as we can to the chosen song column, so we won't have
 	 * total and rank jumping around.
 	 */
-	if (sumcolwidth < 780) {
+	if (sumcolwidth < LOGICAL_SCREEN_WIDTH - 20) {
 		int first_chosen_col = -1;
 		unsigned col = 1;
 
@@ -222,7 +222,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
 		}
 
 		if (first_chosen_col != -1) {
-			colwidth[first_chosen_col] += 780 - sumcolwidth;
+			colwidth[first_chosen_col] += LOGICAL_SCREEN_WIDTH - 20 - sumcolwidth;
 		}
 	}
 }