[MU3 Backend] ENG-81: Fix fret spacer #8636

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

Jump to bottom

Merged

vpereverzev merged 2 commits into musescore:3.6.2_backend from iveshenry18:ENG-81-fret-spacer-render

Jul 20, 2021

Contributor

iveshenry18 commented Jul 16, 2021

Resolves: ENG-81: Fret diagram spacers are incorrect on first render

This PR includes two fixes to FretDiagram spacers:

It prevents them from creating an unnecessary gap to the right of a barline (by omitting the left spacer if it is the first ChordRest of the measure
It partially lays out the FretDiagram before creating the spacer, correcting the initial creation of the spacer (which previously was incorrect upon user input).

I signed CLA
I made sure the code in the PR follows the coding rules
I made sure the code compiles on my machine
I made sure there are no unnecessary changes in the code
I made sure the title of the PR reflects the core meaning of the issue you are solving
I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
I made sure the commit message title starts with "fix #424242:" if there is a related issue
I created the test (mtest, vtest, script test) to verify the changes I made

iveshenry18 added 2 commits

July 15, 2021 19:30


          Remove left FretDiagram spacer if first beat of measure

98b2149

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.


          ENG-81: Fretboard spacers are initially incorrect

e717c3d

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

iveshenry18 mentioned this pull request

[MU3 Backend] ENG-18-adjacent Remove left FretDiagram spacer if first beat of measure #8619

Closed

8 tasks

Jojo-Schmitz mentioned this pull request

[MU3 Issue] MuseScore 3.6.3 or 3.7.0, PRs to be merged and issues to be fixed. #7449

Closed

its-not-nice approved these changes

View reviewed changes

vpereverzev approved these changes

View reviewed changes

vpereverzev merged commit b2f88a8 into musescore:3.6.2_backend

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

c72dbe9

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

beb1c39

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

2b1ec5d

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

775098e

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

3fc2bd8

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

4ffd62d

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

1a9bf39

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

06cad12

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

007fa50

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

572a36a

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

31fe1c8

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

ac3727a

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

53209ec

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

ff66fa4

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

fbd01ce

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

a5ff7bc

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

cff225d

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

97fd597

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

b19413b

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

43ec817

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

1294d34

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

4c95965

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

1c00e97

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

da48979

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

0ed2c68

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

3f734c3

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

08d2086

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz mentioned this pull request

[MU3] Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0 #9000

Closed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

999a10d

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

c217b4c

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

431240d

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

b26c610

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

6ee9633

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

dbd4a30

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

5282c03

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

3ea4cd7

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

e910b63

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

29cc3e8

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Jojo-Schmitz mentioned this pull request

Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0 Jojo-Schmitz/MuseScore#80

Closed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Remove left FretDiagram spacer if first beat of measure

a87e4db

This commit changes the spacer code in ChordRest::shape to prevent a
left space from being created in the first beat of a measure. This
spacer was causing an unnecessary gap between the barline and the first
beat.

Duplicate of musescore#8636, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-81: Fretboard spacers are initially incorrect

aaec92a

On first render, fretboards created incorrect horizontal spacers since
they had not yet been laid out. This commit extracts the portion of
FretDiagram::layout() necessary for horizontal positioning and calls
it before creating the spacer.

Duplicate of musescore#8636, part 2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet