Skip to content

Fix #25848: Crash when dragging item from "More" palette to parent palette #26266

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

Merged
mathesoncalum merged 1 commit into from
Jan 30, 2025
Merged

Fix #25848: Crash when dragging item from "More" palette to parent palette #26266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/palette/qml/MuseScore/Palette/internal/MoreElementsPopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ StyledPopupView {
property size cellSize
property bool drawGrid

readonly property bool isDragInProgress: masterPalette.state == "drag" || customPalette.state == "drag"

property int maxHeight: 400
contentHeight: column.implicitHeight
contentWidth: 300
Expand Down
13 changes: 12 additions & 1 deletion src/palette/qml/MuseScore/Palette/internal/PaletteTree.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,18 @@ StyledListView {

onClosed: {
enablePaletteAnimations = false;
palettePopup.active = false;
// Deactivating the loader while dragging will cause a crash (#25848), so defer the deactivation...
if (!moreElementsPopup.isDragInProgress) {
palettePopup.active = false;
}
}

onIsDragInProgressChanged: {
const deactivationWasDeferred = !moreElementsPopup.isOpened && palettePopup.active
if (!moreElementsPopup.isDragInProgress && deactivationWasDeferred) {
// We're now safe to deactivate the loader...
palettePopup.active = false
}
}

function scrollToPopupBottom() {
Expand Down