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 #22601: Include text alignment in line layout #22602

Merged
merged 2 commits into from
May 1, 2024

Conversation

XiaoMigros
Copy link
Contributor

@XiaoMigros XiaoMigros commented Apr 27, 2024

Resolves: #22601

  • 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
  • I created a unit test or vtest to verify the changes I made (if applicable)

@cbjeukendrup
Copy link
Contributor

It seems that something similar applies to the end text:
Scherm­afbeelding 2024-04-27 om 18 37 57
The line continues below the text, while I think it should end before. But this also depends on the endTextPlace property, which should probably behave similar to beginTextPlace.
It's difficult to test, because the UI for it is mostly missing in MS4's properties panel.

It would be good to also add a new VTest to this PR, ideally one that verifies all combinations of TextPlace and Alignment, for begin and end text.

@XiaoMigros
Copy link
Contributor Author

It seems that something similar applies to the end text:

Should the end text then also use the 'gap between text and line' property? currently there is no distance added at all

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 27, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 28, 2024
@XiaoMigros XiaoMigros force-pushed the text-line-alignment branch 3 times, most recently from 40e4669 to ba34deb Compare April 28, 2024 16:32
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 28, 2024
@cbjeukendrup
Copy link
Contributor

Should the end text then also use the 'gap between text and line' property? currently there is no distance added at all

Yes, this makes sense to me. Doubtlessly, the next thing people will ask for is separate controls for begin/continue/end text gap, but that would be a separate feature request.

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 29, 2024
Backport of musescore#22602

Plus some cleanup in the includes
@oktophonie oktophonie added the vtests This PR produces approved changes to vtest results label Apr 29, 2024
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Apr 29, 2024
Backport of musescore#22602

Plus some cleanup in the includes
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 1, 2024
Backport of musescore#22602

Plus some cleanup in the includes
@cbjeukendrup cbjeukendrup merged commit 48c6c6d into musescore:master May 1, 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
Development

Successfully merging this pull request may close these issues.

Line component of TextLines ignores Text alignment
4 participants