Merge pull request #108 from aupfred/fix_jwdj_EasyABC_103

#103 highlight note when cursor change in editor

Author: jwdj

CHANGES

@@ -637,6 +637,7 @@ different panes. Tie/untie option added for notes. Broken rhythm
 - New: file setting: ffmpeg
 - Several fixes to support newer Python versions. (thanks aupfred and all that contributed)
 - Updated xml2abc, abc2xml (aupfred)
+- Reenable note highlighting based on cursor position in editor (aupfred)
 - Adapt to new version of abcmidi output (aupfred)
 - Fix playback of a selection on second page (aupfred)
 - Enable Midi playback for Mac based on Apple DLS Synthetiser thanks to mplay library (aupfred)

easy_abc.py

@@ -6778,6 +6778,7 @@ def ScrollMusicPaneToMatchEditor(self, select_closest_note=False, select_closest
 
         closest_xy = None
         closest_col = -9999
+        note_delta = 9999
         line = self.editor.GetCurrentLine()
         col = self.editor.GetCurrentPos() - self.editor.PositionFromLine(line)
         # 1.3.6.2 [JWdJ] 2015-02
@@ -6786,7 +6787,12 @@ def ScrollMusicPaneToMatchEditor(self, select_closest_note=False, select_closest
         # 1.3.6.2 [JWdJ] 2015-02
         for i, (x, y, abc_row, abc_col, desc) in enumerate(page.notes):
             abc_row += row_offset
-            if abc_row == line and (abs(col - abc_col) < abs(closest_col - abc_col)):
+            #FAU 20250126: search for the closest while not switching to next one to early
+            #              with if abc_row == line and and (abs(col - abc_col) < abs(closest_col - abc_col))
+            #              as soon as cursor shifted after the letter of note next note was selected even if only duration of previous note
+            #              %%TODO%%: improve to consider highlight only if cursor is in a note?
+            if abc_row == line and col>=abc_col and (abs(col - abc_col)<note_delta): # and (abs(col - abc_col) < abs(closest_col - abc_col))
+                note_delta=abs(col - abc_col)
                 closest_col = abc_col
                 closest_xy = (x, y)
                 if select_closest_note:
@@ -7368,7 +7374,11 @@ def OnPosChanged(self, evt):
         # otherhand, the following function allows the highlighted note
         # in the MusicPane follow the highlighted note in the editor when
         # it is controlled by the keyboard arrow keys. p09
-        #self.ScrollMusicPaneToMatchEditor(select_closest_note=True, select_closest_page=True) #patch p08
+        #FAU 20250126: To avoid to have sort of a race, keep the call but
+        #              only when no action on the music pane to select
+        #              Add a property in music_pane to identify when a drag selection is ongoing
+        if not self.music_pane.mouse_select_ongoing:
+            self.ScrollMusicPaneToMatchEditor(select_closest_note=True, select_closest_page=True) #patch p08
 
 
     def OnModified(self, evt):

music_score_panel.py

@@ -36,6 +36,8 @@ def __init__(self, parent, renderer):
         self.drag_start_x = None
         self.drag_start_y = None
         self.drag_rect = None
+        #FAU 20250120: mouse_select_ongoing positionned to avoid the race with event of selection change in TextCtrl
+        self.mouse_select_ongoing = False
         self.SetVirtualSize((self.buffer_width, self.buffer_height))
         self.SetScrollbars(20, 20, 50, 50)
         # 1.3.6.2 [JWdJ] 2015-02-14 hook events after initializing to prevent unnecessary redraws
@@ -92,6 +94,8 @@ def get_xy_of_mouse_event(self, event):
 
     def OnLeftButtonDown(self, event):
         if event.LeftDown():
+            #FAU 20250126: mouse_select_ongoing positionned to avoid the race with event of selection change in TextCtrl
+            self.mouse_select_ongoing = True
             self.SetFocus()
             page = self.current_page
             old_selection = page.selected_indices.copy()
@@ -143,6 +147,8 @@ def OnLeftButtonUp(self, event):
             self.drag_rect = None
             self.OnMouseMotion(event)
             self.redraw()
+        #FAU 20250126: mouse_select_ongoing positionned to avoid the race with event of selection change in TextCtrl
+        self.mouse_select_ongoing = False
 
     def OnMouseMotion(self, event):
         page = self.current_page
@@ -162,6 +168,8 @@ def OnMouseMotion(self, event):
                 self.SetCursor(self.pointer_cursor)
             else:
                 self.SetCursor(self.cross_cursor)
+            #FAU 20250126: mouse_select_ongoing positionned to avoid the race with event of selection change in TextCtrl
+            self.mouse_select_ongoing = False
 ##        if self.HasCapture():
 ##            x, y = self.get_xy_of_mouse_event(event)
 ##            self.drag_rect = (min(self.drag_start_x, x), min(self.drag_start_y, y), abs(self.drag_start_x-x), abs(self.drag_start_y-y))
@@ -277,7 +285,8 @@ def draw_notes_highlighted(self, note_indices):
             self.Update()
         finally:
             self.redrawing = False
-            self.highlighted_notes = None
+            if not wx.Platform == "__WXMAC__":
+                self.highlighted_notes = None
 
     def Draw(self):
         dc = wx.BufferedDC(None, self.renderer.buffer)