Skip to content

Commit 8724070

Browse files
committed
Revert "fixed fret box relayout"
This reverts commit 8c286aa.
1 parent 5779eb6 commit 8724070

File tree

5 files changed

+0
-33
lines changed

5 files changed

+0
-33
lines changed

src/engraving/dom/box.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,6 @@ void FBox::init()
752752

753753
DEFER {
754754
triggerLayout();
755-
score()->setNeedLayoutFretBox(true);
756755
};
757756

758757
clearElements();

src/engraving/dom/cmd.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,6 @@ void Score::update(bool resetCmdState, bool layoutAllParts)
458458

459459
TRACEFUNC;
460460

461-
if (m_needLayoutFretBox) {
462-
relayoutFretBox();
463-
m_needLayoutFretBox = false;
464-
}
465-
466461
bool updateAll = false;
467462
{
468463
MasterScore* ms = masterScore();

src/engraving/dom/edit.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7453,25 +7453,6 @@ void Score::rebuildFretBox()
74537453
}
74547454
}
74557455

7456-
void Score::relayoutFretBox()
7457-
{
7458-
FBox* fretBox = findFretBox();
7459-
if (!fretBox) {
7460-
return;
7461-
}
7462-
7463-
fretBox->triggerLayout();
7464-
7465-
for (EngravingObject* linkedObject : fretBox->linkList()) {
7466-
if (!linkedObject || !linkedObject->isFBox() || linkedObject == fretBox) {
7467-
continue;
7468-
}
7469-
7470-
FBox* box = toFBox(linkedObject);
7471-
box->triggerLayout();
7472-
}
7473-
}
7474-
74757456
//---------------------------------------------------------
74767457
// undoAddCR
74777458
//---------------------------------------------------------

src/engraving/dom/score.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,6 @@ void Score::setUpTempoMap()
493493
m_needSetUpTempoMap = false;
494494
}
495495

496-
void Score::setNeedLayoutFretBox(bool layout)
497-
{
498-
m_needLayoutFretBox = layout;
499-
}
500-
501496
//---------------------------------------------------------
502497
// fixTicks
503498
/// updates tempomap and time sig map for a measure

src/engraving/dom/score.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,6 @@ class Score : public EngravingObject, public muse::Injectable
700700

701701
void setUpTempoMapLater();
702702
void setUpTempoMap();
703-
void setNeedLayoutFretBox(bool layout);
704703

705704
EngravingItem* nextElement();
706705
EngravingItem* prevElement();
@@ -1094,7 +1093,6 @@ class Score : public EngravingObject, public muse::Injectable
10941093
void updateSystemLocksOnCreateMMRests(Measure* first, Measure* last);
10951094

10961095
void rebuildFretBox();
1097-
void relayoutFretBox();
10981096

10991097
friend class Chord;
11001098

@@ -1245,7 +1243,6 @@ class Score : public EngravingObject, public muse::Injectable
12451243

12461244
bool m_isOpen = false;
12471245
bool m_needSetUpTempoMap = true;
1248-
bool m_needLayoutFretBox = false;
12491246

12501247
std::map<String, String> m_metaTags;
12511248

0 commit comments

Comments
 (0)