X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=6b2ad3d5ae6ff83778710ea1df6aaf08b0a1dc96;hb=5f61b3659077f6dc7109aacbc802246c9afaf4dd;hp=b2a63159540810fcd1f3d6be6202fc3b44d735e2;hpb=545e13ca5c5ba25ada43b4aac22d2e4f01a20aa6;p=ccbs 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 & 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 & * 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 & } if (first_chosen_col != -1) { - colwidth[first_chosen_col] += 780 - sumcolwidth; + colwidth[first_chosen_col] += LOGICAL_SCREEN_WIDTH - 20 - sumcolwidth; } } }