Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix song-editor regressions and BB-editor bugs introduced in #3487 #4008

Merged
merged 4 commits into from
Nov 29, 2017

Conversation

PhysSong
Copy link
Member

Fix bugs introduced in #3487. Fixes some bugs in #3487, mostly reverting some changes in #3649.
Additional changes:

  • Show copy hint for moving selected TCOs, as well as moving single TCO

Supersedes #3988.

Qt::SmoothTransformation );
new StringPairDrag( QString( "tco_%1" ).arg(
m_tco->getTrack()->type() ),
dataFile.toString(), thumbnail, this );
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, but now you can't select/deselect a single TCO by [CTRL] + Click. That's why I moved this whole block into the mouseMoveEvent(). There we can test if the mouse moved 2 pixels since click(copy TCO) or not(toggleSelected). See: https:/LMMS/lmms/pull/3988/files

Copy link
Member Author

@PhysSong PhysSong Nov 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done via 8434d5f.

@@ -720,16 +720,25 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
m_action = ToggleSelected;
}
}
else if( !me->modifiers() )
else
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BaraMGB Should this be else, or else if( !me->modifiers() )?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The difference would be you can't move a tco with pressed shift and/or alt key. Perhaps else if(!me->modifier) is more discriptive.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. The latter is consistent with piano roll. Anyway, you changed it to the former in #3649. Was that intentional?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I tried to make the code simpler. But now I think else if(! me->modifiers() is more discriptive. If someone wants to add a new modifier key, he/she can see where to add it in the code. Also I think, it's better to have a functionality only in a certain circumstance (no modifier key is pressed)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. Done via 9d4c377.

@BaraMGB
Copy link
Contributor

BaraMGB commented Nov 28, 2017

Sorry, next time I ask before I push to your branch.

@PhysSong
Copy link
Member Author

@BaraMGB It's okay. That's what I were going to changed, but I've accidentally undone the change before I commit.

@PhysSong PhysSong merged commit 6de7cb6 into LMMS:master Nov 29, 2017
@PhysSong PhysSong deleted the regr3487 branch November 29, 2017 05:31
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
)

* Fix TCO copy with Ctrl + Dragging
* Fix text float display in song editor
* avoids override cursor in BBEditor for sampletracks at left side
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants