Issue #593: Are the draw colors for selected and reference inverted o…

…n the drawing setup
calband · Jan 11, 2025 · 2f589d4 · 2f589d4
1 parent 2dd849b
commit 2f589d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/LATEST_RELEASE_NOTES.md b/LATEST_RELEASE_NOTES.md
@@ -2,6 +2,8 @@
 
 Bugs addressed in this release:
 
+* [#593](../../issues/593) Are the draw colors for selected and reference inverted on the drawing setup
+
 Other changes:
 
 * [#590](../../issues/590) Move things related to drawing a sheet to sheet so it can generate Draw commands

diff --git a/src/ColorSetupCanvas.cpp b/src/ColorSetupCanvas.cpp
@@ -63,31 +63,24 @@ ColorSetupCanvas::ColorSetupCanvas(CalChart::Configuration& config, wxWindow* pa
         { "sel", "" },
     };
     mShow->Create_SetupMarchersCommand(labels, 4, field_offset).first(*mShow);
-    mShow->Create_SetupMarchersCommand(labels, 4, field_offset).first(*mShow);
     mShow->Create_SetSelectionListCommand(SelectionList{ 0, 2 }).first(*mShow);
     mShow->Create_SetSymbolCommand(SYMBOL_X).first(*mShow);
     mShow->Create_SetSelectionListCommand(SelectionList{ 1, 3 }).first(*mShow);
     mShow->Create_SetSymbolCommand(SYMBOL_SOLX).first(*mShow);
     mShow->Create_SetSelectionListCommand(SelectionList{}).first(*mShow);
 
+    // we want to show the difference between ref highlight and normal highlight, so we draw ref 1.
+    // As we are doing that it means the reference points will show up in the normal color and the
+    // non-ref point (0) will show up in the reference point color.
     for (auto i = 0; i < 4; ++i) {
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(i * 4), Int2CoordUnits(2)) } }, 0).first(*mShow);
+        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(i * 4), Int2CoordUnits(6)) } }, 0).first(*mShow);
         mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(i * 4), Int2CoordUnits(2)) } }, 1).first(*mShow);
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(i * 4), Int2CoordUnits(2)) } }, 2).first(*mShow);
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(i * 4), Int2CoordUnits(2)) } }, 3).first(*mShow);
-
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(i * 4), Int2CoordUnits(6)) } }, 1).first(*mShow);
     }
 
     mShow->Create_AddSheetsCommand(Show::Sheet_container_t{ *static_cast<CalChart::Show const&>(*mShow).GetCurrentSheet() }, 1).first(*mShow);
     mShow->Create_SetCurrentSheetCommand(1).first(*mShow);
     for (auto i = 0; i < 4; ++i) {
         mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(18 + i * 4), Int2CoordUnits(2 + 2)) } }, 0).first(*mShow);
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(18 + i * 4), Int2CoordUnits(2 + 2)) } }, 1).first(*mShow);
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(18 + i * 4), Int2CoordUnits(2 + 2)) } }, 2).first(*mShow);
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(18 + i * 4), Int2CoordUnits(2 + 2)) } }, 3).first(*mShow);
-
-        mShow->Create_MovePointsCommand({ { i, field_offset + Coord(Int2CoordUnits(18 + i * 4), Int2CoordUnits(2 + 6)) } }, 1).first(*mShow);
     }
     mShow->Create_SetCurrentSheetCommand(0).first(*mShow);