Skip to content

Fix Swing and Straight markings format #27188 #27600

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

Merged
merged 1 commit into from
Apr 14, 2025

Conversation

cheilagoncalves
Copy link
Contributor

@cheilagoncalves cheilagoncalves commented Apr 8, 2025

Called the function initTextStyleType to load the corresponding text style values.

Resolves: #27188

The Swing and Straight markings weren't formatted correctly in the Tempo and Masters palette like the rest of the elements in the section. This occurred because real Tempo texts automatically take the format because of the textStyleType, but since Swing and Straight
elements are simple SystemTexts I add to call the function initTextStyleType so it could load the corresponding text style values.

  • I signed the CLA
  • The title of the PR describes the problem it addresses
  • Each commit's message describes its purpose and effects, and references the issue it resolves
  • If changes are extensive, there is a sequence of easily reviewable commits
  • The code in the PR follows the coding rules
  • There are no unnecessary changes
  • The code compiles and runs on my machine, preferably after each commit individually

@cbjeukendrup
Copy link
Member

The VTests failed; this should be fixed after a rebase, to integrate the latest changes from the master branch.
git pull --rebase upstream master; git push -f
Also, if you could squash the commits into one, that would be great in this case (since these changes are small enough to fit in one commit).

Swing and Straight markings werent formatted
correctly in the Tempo and Masters palette
like the rest of the elements in the section.
This occured because real Tempo texts
automatically take the format because of the
textStyleType, but since Swing and Straight
elements are simple SystemTexts I add to call
initTextStyleType so it could load the
corresponding text style values.
Also removed the call of the function
setTextStyleType,since it is already called in
initTextStyleType.
@cheilagoncalves
Copy link
Contributor Author

The VTests failed; this should be fixed after a rebase, to integrate the latest changes from the master branch. git pull --rebase upstream master; git push -f Also, if you could squash the commits into one, that would be great in this case (since these changes are small enough to fit in one commit).

Thank you, I'll submit these changes!

@zacjansheski
Copy link
Contributor

Tested on MacOS 15, Windows 11, Ubuntu 22.04.3. Approved
#27188 FIXED

@cbjeukendrup cbjeukendrup merged commit 9534097 into musescore:master Apr 14, 2025
11 checks passed
@FrancRos31
Copy link

FrancRos31 commented Apr 14, 2025

Is this PR going to solve #26271, too?

@cbjeukendrup
Copy link
Member

No, this is only about the text weight of those two particular cells.

@cheilagoncalves
Copy link
Contributor Author

Thank you so much for approving my pr!

@Jojo-Schmitz
Copy link
Contributor

Shoudln't that go to 4.5.2 too?

@cbjeukendrup
Copy link
Member

It could. @cheilagoncalves perhaps that's nice, because then your work will soon be visible to the world.

We can port the PR to the 4.5.2 branch for you, but maybe you would like to do it yourself:

  1. Checkout the 4.5.2 branch
  2. Create a new branch based on it (you can choose any name you want, for example port/4.5/swing_straight_text_format)
  3. Cherry-pick the commit from this PR to that new branch (as you can see on this page, the commit SHA is afae820, so you can run git cherry-pick afae820)
  4. Create a PR from that branch, but then on GitHub, instead of setting the base branch to musescore:master, set it to musescore:4.5.2.

@Jojo-Schmitz
Copy link
Contributor

Done, see #27697

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.

Swing and Straight markings aren't bold like the rest of the section elements in the Tempo and Master palettes
5 participants