limit default hotcue palette to 8 colors

daschuer · Mar 25, 2020 · 84a43ec · 84a43ec
1 parent 7b15170
commit 84a43ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/util/color/colorpalette.cpp b/src/util/color/colorpalette.cpp
@@ -19,11 +19,8 @@ mixxx::RgbColor ColorPalette::previousColor(mixxx::RgbColor color) const {
 mixxx::RgbColor ColorPalette::colorForHotcueIndex(unsigned int hotcueIndex) const {
     int colorIndex;
     if (m_hotcueColorIndices.isEmpty()) {
-        // For hotcue n, get nth color from palette
-        // But use only  8 to avoid odd apearances on Hercules P32 or similar
-        colorIndex = hotcueIndex % 8;
+        colorIndex = hotcueIndex;
     } else {
-        // For hotcue n, get nth color from palette
         colorIndex = m_hotcueColorIndices.at(hotcueIndex % m_hotcueColorIndices.size());
     }
     return at(colorIndex % size());

diff --git a/src/util/color/predefinedcolorpalettes.cpp b/src/util/color/predefinedcolorpalettes.cpp
@@ -123,7 +123,11 @@ const ColorPalette PredefinedColorPalettes::kMixxxHotcueColorPalette =
                         kColorMixxxPink,
                         kColorMixxxWhite,
                         kSchemaMigrationReplacementColor,
-                });
+                },
+                // Exclude kSchemaMigrationReplacementColor from the colors assigned to hotcues
+                // If there were 9 colors assigned to hotcues, that would look weird on
+                // controllers with >8 hotcue buttons, for example a Novation Launchpad.
+                QList<unsigned int>{0, 1, 2, 3, 4, 5, 6, 7});
 
 const ColorPalette PredefinedColorPalettes::kSeratoDJIntroHotcueColorPalette =
         ColorPalette(