From de862cb6e822b5a4091691584370fbccd0caad2b Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 5 Oct 2012 08:21:29 -0700
Subject: [PATCH] Remove the correct syllable split on a click on the left side
of the split line
---
aegisub/src/audio_karaoke.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp
index 64ae7bfd1..806891cf2 100644
--- a/aegisub/src/audio_karaoke.cpp
+++ b/aegisub/src/audio_karaoke.cpp
@@ -315,9 +315,9 @@ void AudioKaraoke::OnMouse(wxMouseEvent &event) {
// If the click is sufficiently close to a line of a syllable split,
// remove that split rather than adding a new one
- click_will_remove_split =
- (syl > 0 && shifted_pos <= syl_lines[syl - 1] + 3) ||
- (syl < (int)syl_lines.size() && shifted_pos >= syl_lines[syl] - 3);
+ bool click_right = (syl > 0 && shifted_pos <= syl_lines[syl - 1] + 3);
+ bool click_left = (syl < (int)syl_lines.size() && shifted_pos >= syl_lines[syl] - 3);
+ click_will_remove_split = click_left || click_right;
if (!event.LeftDown()) {
// Erase the old line and draw the new one
@@ -326,7 +326,7 @@ void AudioKaraoke::OnMouse(wxMouseEvent &event) {
}
if (click_will_remove_split) {
- kara->RemoveSplit(syl);
+ kara->RemoveSplit(syl + (click_left && !click_right));
}
else {
kara->AddSplit(syl, split_pos - syl_start_points[syl]);
--
GitLab