Skip to content

Commit fadf6f6

Browse files
committed
Fix parent window bug
1 parent c8c228d commit fadf6f6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/plugins/visualeditor/core/TempoViewModelContextData.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ namespace VisualEditor {
146146
});
147147

148148
scenario = new Core::EditTempoTimeSignatureScenario(this);
149-
scenario->setWindow(static_cast<QQuickWindow *>(q->windowHandle()->window()));
150149
scenario->setProjectTimeline(q->windowHandle()->projectTimeline());
151150
scenario->setDocument(q->windowHandle()->projectDocumentContext()->document());
152151
scenario->setShouldDialogPopupAtCursor(true);
@@ -295,9 +294,9 @@ namespace VisualEditor {
295294
qCDebug(lcTempoViewModelContextData) << "Tempo sequence double clicked" << position;
296295
handleDoubleClicked(labelSequenceItem, position);
297296
});
298-
connect(controller, &sflow::LabelSequenceInteractionController::itemDoubleClicked, this, [=](QQuickItem *, sflow::LabelViewModel *viewItem) {
297+
connect(controller, &sflow::LabelSequenceInteractionController::itemDoubleClicked, this, [=](QQuickItem *labelSequenceItem, sflow::LabelViewModel *viewItem) {
299298
qCDebug(lcTempoViewModelContextData) << "Tempo sequence view item double clicked" << viewItem;
300-
handleItemDoubleClicked(viewItem);
299+
handleItemDoubleClicked(labelSequenceItem, viewItem);
301300
});
302301
return controller;
303302
}
@@ -347,15 +346,17 @@ namespace VisualEditor {
347346
timeManipulator.setTimeViewModel(labelSequenceItem->property("timeViewModel").value<sflow::TimeViewModel *>());
348347
timeManipulator.setTimeLayoutViewModel(labelSequenceItem->property("timeLayoutViewModel").value<sflow::TimeLayoutViewModel *>());
349348
position = timeManipulator.alignPosition(position, sflow::ScopicFlow::AO_Visible);
349+
scenario->setWindow(labelSequenceItem->window());
350350
scenario->insertTempoAt(position);
351351
auto items = tempoSequence->slice(position, 1);
352352
if (items.isEmpty()) {
353353
return;
354354
}
355355
q->windowHandle()->projectDocumentContext()->document()->selectionModel()->select(items.first(), dspx::SelectionModel::Select | dspx::SelectionModel::SetCurrentItem | dspx::SelectionModel::ClearPreviousSelection);
356356
}
357-
void TempoViewModelContextData::handleItemDoubleClicked(sflow::LabelViewModel *viewItem) {
357+
void TempoViewModelContextData::handleItemDoubleClicked(QQuickItem *labelSequenceItem, sflow::LabelViewModel *viewItem) {
358358
Q_Q(ProjectViewModelContext);
359+
scenario->setWindow(labelSequenceItem->window());
359360
scenario->modifyExistingTempoAt(viewItem->position());
360361
}
361362

src/plugins/visualeditor/core/TempoViewModelContextData_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ namespace VisualEditor {
8080
void handleMovePendingStateEntered();
8181
void handleMovingStateExited();
8282
void handleDoubleClicked(QQuickItem *labelSequenceItem, int position);
83-
void handleItemDoubleClicked(sflow::LabelViewModel *viewItem);
83+
void handleItemDoubleClicked(QQuickItem *labelSequenceItem, sflow::LabelViewModel *viewItem);
8484

8585
Q_SIGNALS:
8686
void transactionStarted();

0 commit comments

Comments
 (0)