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

New cross-staff beam position controls #21860

Merged
merged 9 commits into from
Mar 15, 2024

Conversation

mike-spa
Copy link
Contributor

@mike-spa mike-spa commented Mar 7, 2024

Resolves: #18687
Resolves: #19406
Resolves: #14649
Resolves: #21859

First, I've reintroduced the Auto/Up/Down control for beams (they got lost between version 3 and 4). Now for standard (i.e. non cross-staff) beams you get the standard Auto/Up/Down, and for cross-staff beams you get a new Move Up/Down control.

image image

This is how the new controls work. Older files, which didn't have this option, get correctly migrated and cross-staff beams are mapped to the new option.

20240307_174308.mp4

@@ -142,6 +142,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::BEAM_POS, false, 0, P_TYPE::PAIR_REAL, PropertyGroup::POSITION, DUMMY_QT_TR_NOOP("propertyName", "beam position") },
{ Pid::BEAM_MODE, true, "BeamMode", P_TYPE::BEAM_MODE, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "beam mode") },
{ Pid::BEAM_NO_SLOPE, true, "noSlope", P_TYPE::BOOL, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "without slope") },
{ Pid::BEAM_CROSS_STAFF_MOVE, true, "crossStaffMove", P_TYPE::INT, PropertyGroup::APPEARANCE, DUMMY_QT_TR_NOOP("propertyName", "beam staff move") },
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Mar 7, 2024

Choose a reason for hiding this comment

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

Could better align with the other entries in this list

@bkunda
Copy link

bkunda commented Mar 13, 2024

Love this PR @mike-spa 🥰
I have just noticed that the new controls don't seem to be accessible with keyboard navigation though.
Could this also be added to the PR, or would you advise addressing this as a separate issue?
Thanks so much!

Screen.Recording.2024-03-13.at.2.02.36.pm.mov

@mike-spa
Copy link
Contributor Author

Love this PR @mike-spa 🥰 I have just noticed that the new controls don't seem to be accessible with keyboard navigation though. Could this also be added to the PR, or would you advise addressing this as a separate issue? Thanks so much!

Ah yes, I think that's a trivial fix, I'll do it on this PR

@mike-spa
Copy link
Contributor Author

Actually I may need some help @cbjeukendrup with that keyboard navigation issue. I can't quite understand why it's still not working despite the changes I've made in the last commit

src/engraving/dom/beam.cpp Outdated Show resolved Hide resolved
src/engraving/dom/beam.h Outdated Show resolved Hide resolved
src/engraving/dom/beambase.cpp Outdated Show resolved Hide resolved
src/engraving/dom/chordrest.cpp Outdated Show resolved Hide resolved
src/engraving/dom/tremolotwochord.h Outdated Show resolved Hide resolved
@cbjeukendrup cbjeukendrup merged commit aeb7979 into musescore:master Mar 15, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
vtests This PR produces approved changes to vtest results
Projects
None yet
6 participants