Left-dragging the selection start marker in the audio display now only restarts the selection after a threshold defined by the Audio Start Drag Sensitivity option. A commented-out editbox for this value is added to the Options dialogue, it is commented out due to the feature freeze towards 2.2.0.
This should fix #703. Originally committed to SVN as r2198.
This commit is contained in:
parent
f3fe600714
commit
6f23c635be
|
@ -1591,7 +1591,7 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
|
||||||
updated = true;
|
updated = true;
|
||||||
diagUpdated = true;
|
diagUpdated = true;
|
||||||
|
|
||||||
if (leftIsDown && x != lastX) {
|
if (leftIsDown && abs((long)(x-lastX)) > Options.AsInt(_T("Audio Start Drag Sensitivity"))) {
|
||||||
selStart = lastX;
|
selStart = lastX;
|
||||||
selEnd = x;
|
selEnd = x;
|
||||||
curStartMS = GetBoundarySnap(GetMSAtX(lastX),10,event.ShiftDown(),true);
|
curStartMS = GetBoundarySnap(GetMSAtX(lastX),10,event.ShiftDown(),true);
|
||||||
|
|
|
@ -453,6 +453,14 @@ DialogOptions::DialogOptions(wxWindow *parent)
|
||||||
AddTextControl(audioPage,audioSizer4,_("Default lead-in length"),_T("Audio lead in"),TEXT_TYPE_NUMBER);
|
AddTextControl(audioPage,audioSizer4,_("Default lead-in length"),_T("Audio lead in"),TEXT_TYPE_NUMBER);
|
||||||
AddTextControl(audioPage,audioSizer4,_("Default lead-out length"),_T("Audio lead out"),TEXT_TYPE_NUMBER);
|
AddTextControl(audioPage,audioSizer4,_("Default lead-out length"),_T("Audio lead out"),TEXT_TYPE_NUMBER);
|
||||||
AddComboControl(audioPage,audioSizer4,_("Show inactive lines"),_T("Audio Inactive Lines Display Mode"),wxArrayString(3,choices1));
|
AddComboControl(audioPage,audioSizer4,_("Show inactive lines"),_T("Audio Inactive Lines Display Mode"),wxArrayString(3,choices1));
|
||||||
|
/*
|
||||||
|
* Option not in dialogue because it breaks the documentation.
|
||||||
|
* The default should be good enough for most people and it can still be edited manually.
|
||||||
|
* This should be enabled when we can raise the UI/feature freeze towards 2.2.0.
|
||||||
|
* -jfs
|
||||||
|
*
|
||||||
|
AddTextControl(audioPage,audioSizer4,_("Start-marker drag sensitivity"),_T("Audio Start Drag Sensitivity"),TEXT_TYPE_NUMBER);
|
||||||
|
*/
|
||||||
audioSizer4->AddGrowableCol(0,1);
|
audioSizer4->AddGrowableCol(0,1);
|
||||||
|
|
||||||
// Sizers
|
// Sizers
|
||||||
|
|
|
@ -189,6 +189,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
|
||||||
SetModificationType(MOD_AUDIO);
|
SetModificationType(MOD_AUDIO);
|
||||||
SetInt(_T("Audio Inactive Lines Display Mode"),1);
|
SetInt(_T("Audio Inactive Lines Display Mode"),1);
|
||||||
SetBool(_T("Disable Dragging Times"), false);
|
SetBool(_T("Disable Dragging Times"), false);
|
||||||
|
SetInt(_T("Audio Start Drag Sensitivity"), 2);
|
||||||
|
|
||||||
// Audio Advanced
|
// Audio Advanced
|
||||||
SetModificationType(MOD_AUDIO_RELOAD);
|
SetModificationType(MOD_AUDIO_RELOAD);
|
||||||
|
|
Loading…
Reference in a new issue