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 for issue #879, wrong cursor for selected resizeable blocks in song editor #5996

Merged
merged 3 commits into from
Aug 28, 2022

Conversation

craslaw
Copy link
Contributor

@craslaw craslaw commented Apr 26, 2021

This PR checks if TCOs are selected by the box selector before switching the cursor to the resize cursor at the edge of a selected block.

Before (Issue #879):
The cursor updates to the resize cursor for one or more box-selected TCOs, but clicking and dragging results in moving all the selected TCOs.

After:
Same behavior as before, except the cursor does not change from the hand icon when hovering over the edge of a box-selected TCO.

From a UI stance, it makes sense to be able to resize one or more resizable blocks that are selected with the box tool. However, adding this code to the box select tool seems out of scope for this bug, and may be better off in a separate feature request - post refactor too.

@LmmsBot
Copy link

LmmsBot commented Apr 26, 2021

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Windows

macOS

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://13665-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.104%2Bg2121e2f-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/13665?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://13661-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.104%2Bg2121e2f79-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/13661?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://13664-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.104%2Bg2121e2f79-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/13664?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/yyn7ne424s4kbjbq/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/38867397"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/k0cvjlg7xhcgb0xv/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/38867397"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://13663-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.104%2Bg2121e2f79-mac10.14.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/13663?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "0abaf7bf87c958b2e5ee2faefad86e05581190ff"}

@superpaik
Copy link
Contributor

superpaik commented Apr 26, 2021

It works ok to me (windows 10-64bits)
Just one minor issue that I think it's not been introduced by this PR but maybe just double check just in case. Sample tracks now can be extended to the left, I don't know if that is intended or not (it doesn't happen in 1.2)

@craslaw
Copy link
Contributor Author

craslaw commented Aug 27, 2021

Just tested the version without my code changes and the sample tracks can still be extended to the left when in Draw mode.

Digging a little deeper, resizing samples from the left was indeed added in 1.3: #5463 (comment)

@PhysSong
Copy link
Member

@Spekular While reviewing this PR, I found that knife mode is not working with selections. Is it intended?
If it is, this looks good to me. There are some merge conflicts due to renaming from TrackContentObject(TCO) to Clip, though.

@Spekular
Copy link
Member

@Spekular While reviewing this PR, I found that knife mode is not working with selections. Is it intended?

I didn't really have selections in mind when I wrote it. I'm not sure what the best UX would be for cutting multiple clips so for now I think it's fine to only cut one at a time?

Copy link
Contributor

@allejok96 allejok96 left a comment

Choose a reason for hiding this comment

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

Looks good, if you can resolve the merge conflicts I think we can merge this and close the bug. It's such a simple change. Thanks for your contribution, even if the response has been slow.

src/gui/TrackContentObjectView.cpp Outdated Show resolved Hide resolved
@PhysSong PhysSong merged commit 17f5976 into LMMS:master Aug 28, 2022
sakertooth pushed a commit to sakertooth/lmms that referenced this pull request May 30, 2023
@zonkmachine zonkmachine mentioned this pull request Aug 31, 2023
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.

6 participants