allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

Improve time selection dragging behavior

Browse Source
This commit is contained in:
xenakios 2018-02-23 18:21:28 +02:00
parent 6f6670b2d4
commit 3c20facdbc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/PluginEditor.cpp
View File

@ -596,6 +596,7 @@ void WaveformComponent::mouseDown(const MouseEvent & e)
void WaveformComponent::mouseUp(const MouseEvent & /*e*/) void WaveformComponent::mouseUp(const MouseEvent & /*e*/)
{ {
m_is_dragging_selection = false;
m_lock_timesel_set = false; m_lock_timesel_set = false;
m_mousedown = false; m_mousedown = false;
m_didseek = false; m_didseek = false;
@ -610,14 +611,15 @@ void WaveformComponent::mouseDrag(const MouseEvent & e)
{ {
if (m_didseek == true) if (m_didseek == true)
return; return;
if (m_time_sel_drag_target == 0 && e.y>=50) if (m_time_sel_drag_target == 0 && e.y>=50 && m_is_dragging_selection==false)
{ {
m_time_sel_start = m_drag_time_start; m_time_sel_start = m_drag_time_start;
m_time_sel_end = viewXToNormalized(e.x); m_time_sel_end = viewXToNormalized(e.x);
} }
double curlen = m_time_sel_end - m_time_sel_start; double curlen = m_time_sel_end - m_time_sel_start;
if (m_time_sel_drag_target == 0 && e.y<50 && m_is_at_selection_drag_area) if (m_time_sel_drag_target == 0 && m_is_at_selection_drag_area)
{ {
m_is_dragging_selection = true;
double diff = m_drag_time_start - viewXToNormalized(e.x); double diff = m_drag_time_start - viewXToNormalized(e.x);
m_time_sel_start = jlimit<double>(0.0, 1.0-curlen, m_time_sel_start - diff); m_time_sel_start = jlimit<double>(0.0, 1.0-curlen, m_time_sel_start - diff);
m_time_sel_end = jlimit<double>(curlen, 1.0, m_time_sel_end - diff); m_time_sel_end = jlimit<double>(curlen, 1.0, m_time_sel_end - diff);

1
Source/PluginEditor.h
View File

@ -168,6 +168,7 @@ private:
bool m_lock_timesel_set = false; bool m_lock_timesel_set = false;
bool m_using_audio_buffer = false; bool m_using_audio_buffer = false;
bool m_is_at_selection_drag_area = false; bool m_is_at_selection_drag_area = false;
bool m_is_dragging_selection = false;
void updateCachedImage(); void updateCachedImage();
double viewXToNormalized(double xcor) double viewXToNormalized(double xcor)
{ {