mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix snapping audio markers when dragging inactive line markers with ctrl

Browse source 
We do need to check if the inactive markers are in the active set when
ctrl-dragging, as otherwise there'll always be a marker 0 pixels away to
snap to. Fortunately when ctrl-dragging all of the the markers involved
are by definition very close together, so it would be very difficult to
have enough markers to check for this to be a performance issue.

Closes #1823.
This commit is contained in:
Thomas Goyne 2015-03-01 11:09:43 -08:00
parent 801a8915d1
commit 40ae2cdc35
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/audio_timing_dialogue.cpp
View file

@ -845,6 +845,9 @@ int AudioTimingControllerDialogue::SnapMarkers(int snap_range, std::vector<Audio
std::vector<int> inactive_markers; std::vector<int> inactive_markers;
inactive_markers.reserve(inactive_lines.size() * 2 + selected_lines.size() * 2 + 2 - active.size()); inactive_markers.reserve(inactive_lines.size() * 2 + selected_lines.size() * 2 + 2 - active.size());
// Add a marker to the set to check for snaps if it's in the right time
// range, isn't at the same place as a marker already in the set, and isn't
// one of the markers being moved
auto add_inactive = [&](const DialogueTimingMarker *m, bool check) auto add_inactive = [&](const DialogueTimingMarker *m, bool check)
{ {
if (!marker_range.contains(*m)) return; if (!marker_range.contains(*m)) return;
@ -853,13 +856,18 @@ int AudioTimingControllerDialogue::SnapMarkers(int snap_range, std::vector<Audio
inactive_markers.push_back(*m); inactive_markers.push_back(*m);
}; };
bool moving_entire_selection = clicked_ms != INT_MIN;
for (auto const& line : inactive_lines) for (auto const& line : inactive_lines)
{ {
add_inactive(line.GetLeftMarker(), false); // If we're alt-dragging the entire selection, there can't be any
add_inactive(line.GetRightMarker(), false); // markers from inactive lines in the active set, so no need to check
// for them
add_inactive(line.GetLeftMarker(), !moving_entire_selection);
add_inactive(line.GetRightMarker(), !moving_entire_selection);
} }
if (active.size() != selected_lines.size() * 2 + 2) // And similarly, there can't be any inactive markers from selected lines
if (!moving_entire_selection)
{ {
for (auto const& line : selected_lines) for (auto const& line : selected_lines)
{ {
@ -870,16 +878,12 @@ int AudioTimingControllerDialogue::SnapMarkers(int snap_range, std::vector<Audio
add_inactive(active_line.GetRightMarker(), true); add_inactive(active_line.GetRightMarker(), true);
} }
int snap_distance = 0; int snap_distance = INT_MAX;
bool has_snapped = false;
auto check = [&](int marker, int pos) auto check = [&](int marker, int pos)
{ {
auto dist = marker - pos; auto dist = marker - pos;
if (!has_snapped) if (tabs(dist) < tabs(snap_distance))
snap_distance = dist; snap_distance = dist;
else if (tabs(dist) < tabs(snap_distance))
snap_distance = dist;
has_snapped = true;
}; };
int prev = -1; int prev = -1;
@ -908,7 +912,7 @@ int AudioTimingControllerDialogue::SnapMarkers(int snap_range, std::vector<Audio
} }
} }
if (!has_snapped || tabs(snap_distance) > snap_range) if (tabs(snap_distance) > snap_range)
return 0; return 0;
for (auto m : active) for (auto m : active)