LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8878 from Eism/instruments_popups_fix

Browse source 
[MU4] Fixed popups limiting in instruments panel
This commit is contained in:
RomanPudashkin 2021-08-19 13:06:47 +02:00 committed by GitHub
commit 260f101867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/framework/uicomponents/qml/MuseScore/UiComponents/Dropdown.qml
View file

@ -138,6 +138,12 @@ Item {
}
}
function ensureActiveFocus() {
if (mainItem.navigation) {
mainItem.navigation.requestActive()
}
}
DropdownItem {
id: mainItem
anchors.fill: parent

2
src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsPanel.qml
View file

@ -240,6 +240,8 @@ Item {
type: treeItemDelegateLoader.delegateType
sideMargin: contentColumn.sideMargin
popupAnchorItem: root
onClicked: {
instrumentsTreeModel.selectRow(styleData.index)
}

6
src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsTreeItemDelegate.qml
View file

@ -41,6 +41,8 @@ Item {
property int sideMargin: 0
property var popupAnchorItem: null
signal clicked(var mouse)
signal doubleClicked(var mouse)
signal focusActived()
@ -229,6 +231,8 @@ Item {
id: instrumentSettingsComp
InstrumentSettingsPopup {
navigationParentControl: settingsButton.navigation
anchorItem: popupAnchorItem
onClosed: {
prv.resetOpenedPopup()
popupLoader.sourceComponent = null
@ -240,6 +244,8 @@ Item {
id: staffSettingsComp
StaffSettingsPopup {
navigationParentControl: settingsButton.navigation
anchorItem: popupAnchorItem
onClosed: {
prv.resetOpenedPopup()
popupLoader.sourceComponent = null