Skip to content

Knife Tool for Sample Clips (Again) #5524

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.

Sign up for GitHub

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

Merged
Spekular merged 35 commits into from
Mar 12, 2021
Merged

Knife Tool for Sample Clips (Again) #5524

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c8c710b
Rebase BaraMGB's Knife
Spekular May 29, 2019
c14efd4
Draw marker
Spekular May 29, 2019
6672bfc
Refactoring and shift mode
Spekular Jul 27, 2019
b52fbdb
Allow resizing
Spekular Jul 27, 2019
79fda6f
Add Icon
Spekular Jul 28, 2019
05a2275
Fix stuck marker on RMB, remove unnecessary cast
Spekular Jul 29, 2019
06bccf6
Remove redundant line, more const
Spekular Jul 29, 2019
d1e5de4
Fix
Spekular Jul 29, 2019
18bd074
Review fixes
Spekular Sep 7, 2019
c2c0c3c
Only perform split logic for SampleTCO
Spekular Sep 7, 2019
a519f7c
Add unquantizedModHeld function
Spekular Sep 25, 2019
cfa5389
missed one
Spekular Sep 25, 2019
f05ada0
Merge remote-tracking branch 'upstream/master' into Knife
PhysSong May 3, 2020
aac9c07
Don't use copy/paste
Spekular May 5, 2020
bdde426
Don't use copy/paste
Spekular May 5, 2020
54b2002
Committed too early
Spekular May 5, 2020
8e8cf2c
More git troubles
Spekular May 5, 2020
3f39abf
Fix undo
Spekular May 5, 2020
5b8bd6d
Merge
Spekular May 10, 2020
31b938d
git dammit
Spekular May 10, 2020
902f775
Cleaner solution
Spekular May 22, 2020
e5a818d
Merge branch 'ROT' of https://github.com/Spekular/lmms
Spekular Jun 2, 2020
12d818d
Set cursor, add copy assignment to SampleBuffer
Spekular Jun 2, 2020
e9906bc
Add TODO comment
Spekular Oct 3, 2020
84ff7e7
Merge commit
Spekular Jan 1, 2021
19c31f3
Make it build
Spekular Jan 1, 2021
3a532b3
Fixes from review
Spekular Jan 4, 2021
08aaea3
Make splitTCO virtual
Spekular Jan 5, 2021
22a8d47
Make splitTCO more generic
Spekular Jan 14, 2021
4782994
Prevent resizing of MIDI clips in knife mode
Spekular Jan 14, 2021
245160d
Fix move/resize and rework box select via ctrl
Spekular Jan 16, 2021
d498802
Apply suggestions from code review.
Spekular Jan 26, 2021
81fc127
Don't show inaccurate/useless/empty text float in knife mode
Spekular Jan 26, 2021
4c604d8
Addresses Github review
IanCaio Feb 12, 2021
6fb38c4
Revert format changes in Track
Spekular Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix stuck marker on RMB, remove unnecessary cast
  • Loading branch information
@Spekular
Spekular committed Jul 29, 2019
commit 05a2275e4571f2c92f0e2b600e8ef80243e23364
9 changes: 8 additions & 1 deletion src/core/Track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,6 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
else if (sTco)
{
m_action = Split;
SampleTCO * sTco = dynamic_cast<SampleTCO*>( m_tco );
sTco->setMarkerPos( knifeMarkerPos( me ) );
sTco->setMarkerEnabled( true );
update();
Expand Down Expand Up @@ -841,6 +840,14 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
{
remove();
}
if (m_action == Split){
m_action = NoAction;
SampleTCO * sTco = dynamic_cast<SampleTCO*>( m_tco );
if (sTco) {
sTco->setMarkerEnabled( false );
update();
}
}
}
else if( me->button() == Qt::MidButton )
{
Expand Down