Skip to content

Commit 7d79f10

Browse files
committed
Fix bugs
1 parent b2947ee commit 7d79f10

4 files changed

Lines changed: 3 additions & 11 deletions

File tree

src/plugins/coreplugin/qml/controls/MusicPitchPropertyEditorField.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ AbstractPropertyEditorField {
1818
label: d.label
1919
columnItem: MusicPitchSpinBox {
2020
id: control
21-
accidentalType: d.windowHandle?.projectDocumentContext.document.model.global.accidentalType
21+
accidentalType: d.windowHandle?.projectDocumentContext.document.model.global.accidentalType ?? 0
2222
value: d.value ?? 0
2323
from: d.from
2424
to: d.to

src/plugins/coreplugin/qml/propertyeditors/MetadataPropertyEditor.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ PropertyEditorGroupBox {
7373
Layout.fillWidth: true
7474
label: accidentalTypeField.label
7575
columnItem: TabBar {
76-
currentIndex: accidentalTypeField.value
76+
currentIndex: accidentalTypeField.value ?? 0
7777
TabButton {
7878
icon.source: "qrc:/diffscope/coreplugin/icons/accidental_flat.svg"
7979
text: qsTr("Flat")

src/plugins/visualeditor/core/PianoRollPanelInterface.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ namespace VisualEditor {
146146
noteEditLayerInteractionController->setSecondaryItemInteraction(sflow::NoteEditLayerInteractionController::CopyAndMove);
147147
noteEditLayerInteractionController->setPrimarySceneInteraction(sflow::NoteEditLayerInteractionController::RubberBandSelect);
148148
noteEditLayerInteractionController->setSecondarySceneInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
149-
noteEditLayerInteractionController->setPrimarySelectInteraction(sflow::NoteEditLayerInteractionController::RubberBandSelect);
150-
noteEditLayerInteractionController->setSecondarySelectInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
151149
break;
152150
}
153151
case PianoRollPanelInterface::PencilTool: {
@@ -165,8 +163,6 @@ namespace VisualEditor {
165163
noteEditLayerInteractionController->setSecondaryItemInteraction(sflow::NoteEditLayerInteractionController::Draw);
166164
noteEditLayerInteractionController->setPrimarySceneInteraction(sflow::NoteEditLayerInteractionController::Draw);
167165
noteEditLayerInteractionController->setSecondarySceneInteraction(sflow::NoteEditLayerInteractionController::Draw);
168-
noteEditLayerInteractionController->setPrimarySelectInteraction(sflow::NoteEditLayerInteractionController::Draw);
169-
noteEditLayerInteractionController->setSecondarySelectInteraction(sflow::NoteEditLayerInteractionController::Draw);
170166
break;
171167
}
172168
case PianoRollPanelInterface::ScissorTool: {
@@ -184,8 +180,6 @@ namespace VisualEditor {
184180
noteEditLayerInteractionController->setSecondaryItemInteraction(sflow::NoteEditLayerInteractionController::Split);
185181
noteEditLayerInteractionController->setPrimarySceneInteraction(sflow::NoteEditLayerInteractionController::RubberBandSelect);
186182
noteEditLayerInteractionController->setSecondarySceneInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
187-
noteEditLayerInteractionController->setPrimarySelectInteraction(sflow::NoteEditLayerInteractionController::RubberBandSelect);
188-
noteEditLayerInteractionController->setSecondarySelectInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
189183
break;
190184
}
191185
case PianoRollPanelInterface::SelectTool: {
@@ -203,8 +197,6 @@ namespace VisualEditor {
203197
noteEditLayerInteractionController->setSecondaryItemInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
204198
noteEditLayerInteractionController->setPrimarySceneInteraction(sflow::NoteEditLayerInteractionController::RubberBandSelect);
205199
noteEditLayerInteractionController->setSecondarySceneInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
206-
noteEditLayerInteractionController->setPrimarySelectInteraction(sflow::NoteEditLayerInteractionController::RubberBandSelect);
207-
noteEditLayerInteractionController->setSecondarySelectInteraction(sflow::NoteEditLayerInteractionController::TimeRangeSelect);
208200
break;
209201
}
210202
case PianoRollPanelInterface::HandTool:

0 commit comments

Comments
 (0)