Automation Editor - delete automation point #3986
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Here is the essence of the changes from merged commits b68dc57, 3de3ea6 and this PR.
diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
index be3fb52..733cf28 100644
--- a/src/gui/editors/AutomationEditor.cpp
+++ b/src/gui/editors/AutomationEditor.cpp
@@ -517,16 +517,13 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
( it+1==time_map.end() ||
pos_ticks <= (it+1).key() ) &&
( pos_ticks<= it.key() + MidiTime::ticksPerTact() *4 / m_ppt ) &&
- level <= it.value() )
+ ( level == it.value() || mouseEvent->button() == Qt::RightButton ) )
{
break;
}I just rolled along with the original code. It feels a bit quirky but it works quite well actually. Trying to straighten it out a bit now but I doubt that I can do it. |
PhysSong
reviewed
Nov 20, 2017
src/gui/editors/AutomationEditor.cpp
Outdated
| ( pos_ticks<= it.key() + MidiTime::ticksPerTact() *4 / m_ppt ) && | ||
| level == it.value() ) | ||
| ( level == it.value() || ( level != it.value() && | ||
| mouseEvent->button() == Qt::RightButton ) ) ) |
Member
There was a problem hiding this comment.
It is equivalent to this:
( level == it.value() || mouseEvent->button() == Qt::RightButton ) )
zonkmachine
force-pushed
the
automationpointdelete
branch
from
2e91976 to
394912a
Compare
Fix regression from b68dc57 Let the right mouse button delete the automation point like before and add the space above it too.
zonkmachine
force-pushed
the
automationpointdelete
branch
from
394912a to
8bc7b01
Compare
Contributor
Author
|
The action on delete is not as spot on as for left click to move. It's the same as before though. Fixing this is going to be a lot messier. I think this is good for now. |
Contributor
Author
|
Merge? |
sdasda7777
pushed a commit
to sdasda7777/lmms
that referenced
this pull request
Jun 28, 2022
Fix regression from 7772edc Let the right mouse button delete the automation point like before and add the space above it too.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix regression from b68dc57 where deleting a point by right clicking without dragging is defunct.
I misunderstood the algorithm. The selection for add/delete was dual.
The latter appeared to me to be an obvious glitch so I pushed a fix to stable-1.2, messed up and was set for hours of fun with git and submodules. ☠️ The final bug fixed in this PR removes the dual action altogether.