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

Allow clicking anywhere in the audio display for alt-dragging

Browse source
This commit is contained in:
Thomas Goyne 2014-05-14 06:40:01 -07:00
parent 48acd4aa13
commit 9168484fc6
4 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/audio_display.cpp
View file

@ -1064,7 +1064,7 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
{
const int timepos = TimeFromRelativeX(mouse_x);
if (timing->IsNearbyMarker(timepos, drag_sensitivity))
if (timing->IsNearbyMarker(timepos, drag_sensitivity, event.AltDown()))
SetCursor(wxCursor(wxCURSOR_SIZEWE));
else
SetCursor(wxNullCursor);

2
src/audio_timing.h
View file

@ -145,7 +145,7 @@ public:
///
/// This is solely for hit-testing against draggable markers, for
/// controlling the mouse cursor.
virtual bool IsNearbyMarker(int ms, int sensitivity) const = 0;
virtual bool IsNearbyMarker(int ms, int sensitivity, bool alt_down) const = 0;
/// @brief The user pressed the left mouse button on the audio
/// @param ms The time in milliseconds the user clicked

40
src/audio_timing_dialogue.cpp
View file

@ -326,8 +326,8 @@ class AudioTimingControllerDialogue final : public AudioTimingController {
/// The owning project context
agi::Context *context;
/// The marker which was clicked on for relative shifting in alt-click mode
DialogueTimingMarker *clicked_marker = nullptr;
/// The time which was clicked on for alt-dragging mode
int clicked_ms;
/// Autocommit option
const agi::OptionValue *auto_commit = OPT_GET("Audio/Auto/Commit");
@ -403,7 +403,7 @@ public:
void AddLeadOut() override;
void ModifyLength(int delta, bool shift_following) override;
void ModifyStart(int delta) override;
bool IsNearbyMarker(int ms, int sensitivity) const override;
bool IsNearbyMarker(int ms, int sensitivity, bool alt_down) const override;
std::vector<AudioMarker*> OnLeftClick(int ms, bool ctrl_down, bool alt_down, int sensitivity, int snap_range) override;
std::vector<AudioMarker*> OnRightClick(int ms, bool, int sensitivity, int snap_range) override;
void OnMarkerDrag(std::vector<AudioMarker*> const& markers, int new_position, int snap_range) override;
@ -607,10 +607,10 @@ void AudioTimingControllerDialogue::ModifyStart(int delta) {
std::min<int>(*m + delta * 10, *active_line.GetRightMarker()));
}
bool AudioTimingControllerDialogue::IsNearbyMarker(int ms, int sensitivity) const
bool AudioTimingControllerDialogue::IsNearbyMarker(int ms, int sensitivity, bool alt_down) const
{
assert(sensitivity >= 0);
return active_line.ContainsMarker(TimeRange(ms-sensitivity, ms+sensitivity));
return alt_down || active_line.ContainsMarker(TimeRange(ms-sensitivity, ms+sensitivity));
}
std::vector<AudioMarker*> AudioTimingControllerDialogue::OnLeftClick(int ms, bool ctrl_down, bool alt_down, int sensitivity, int snap_range)
@ -618,10 +618,18 @@ std::vector<AudioMarker*> AudioTimingControllerDialogue::OnLeftClick(int ms, boo
assert(sensitivity >= 0);
assert(snap_range >= 0);
clicked_marker = nullptr;
std::vector<AudioMarker*> ret;
clicked_ms = -1;
if (alt_down)
{
clicked_ms = ms;
active_line.GetMarkers(&ret);
for (auto const& line : selected_lines)
line.GetMarkers(&ret);
return ret;
}
DialogueTimingMarker *left = active_line.GetLeftMarker();
DialogueTimingMarker *right = active_line.GetRightMarker();
@ -651,13 +659,6 @@ std::vector<AudioMarker*> AudioTimingControllerDialogue::OnLeftClick(int ms, boo
for (; it != markers.end() && !(*clicked < **it); ++it)
ret.push_back(*it);
}
else if (alt_down)
{
clicked_marker = clicked;
active_line.GetMarkers(&ret);
for (auto const& line : selected_lines)
line.GetMarkers(&ret);
}
else
ret.push_back(clicked);
@ -671,7 +672,7 @@ std::vector<AudioMarker*> AudioTimingControllerDialogue::OnLeftClick(int ms, boo
std::vector<AudioMarker*> AudioTimingControllerDialogue::OnRightClick(int ms, bool, int sensitivity, int snap_range)
{
clicked_marker = nullptr;
clicked_ms = -1;
std::vector<AudioMarker*> ret = GetRightMarkers();
SetMarkers(ret, SnapPosition(ms, snap_range, ret));
return ret;
@ -692,7 +693,12 @@ void AudioTimingControllerDialogue::SetMarkers(std::vector<AudioMarker*> const&
{
if (upd_markers.empty()) return;
int shift = clicked_marker ? ms - *clicked_marker : 0;
int shift = 0;
if (clicked_ms >= 0)
{
shift = ms - clicked_ms;
clicked_ms = ms;
}
// Since we're moving markers, the sorted list of markers will need to be
// resorted. To avoid resorting the entire thing, find the subrange that
@ -719,7 +725,7 @@ void AudioTimingControllerDialogue::SetMarkers(std::vector<AudioMarker*> const&
for (auto upd_marker : upd_markers)
{
auto marker = static_cast<DialogueTimingMarker*>(upd_marker);
marker->SetPosition(clicked_marker ? *marker + shift : ms);
marker->SetPosition(clicked_ms >= 0 ? *marker + shift : ms);
modified_lines.insert(marker->GetLine());
}

4
src/audio_timing_karaoke.cpp
View file

@ -139,7 +139,7 @@ public:
void AddLeadOut() override;
void ModifyLength(int delta, bool shift_following) override;
void ModifyStart(int delta) override;
bool IsNearbyMarker(int ms, int sensitivity) const override;
bool IsNearbyMarker(int ms, int sensitivity, bool) const override;
std::vector<AudioMarker*> OnLeftClick(int ms, bool, bool, int sensitivity, int) override;
std::vector<AudioMarker*> OnRightClick(int ms, bool, int, int) override;
void OnMarkerDrag(std::vector<AudioMarker*> const& marker, int new_position, int) override;
@ -331,7 +331,7 @@ void AudioTimingControllerKaraoke::ModifyStart(int delta) {
AnnounceChanges(cur_syl);
}
bool AudioTimingControllerKaraoke::IsNearbyMarker(int ms, int sensitivity) const {
bool AudioTimingControllerKaraoke::IsNearbyMarker(int ms, int sensitivity, bool) const {
TimeRange range(ms - sensitivity, ms + sensitivity);
return any_of(markers.begin(), markers.end(), [&](KaraokeMarker const& km) {
return range.contains(km);