Skip to content
Snippets Groups Projects
Commit a659fe7e authored by SeeLook's avatar SeeLook
Browse files

Get rid of main window grid, place controls manually, adjust to single note mode

parent 3324a469
Branches
Tags
No related merge requests found
......@@ -66,22 +66,29 @@ ApplicationWindow {
MainMenu { id: mainMenu }
header: mainMenu.toolBar
Grid {
anchors.fill: parent
columns: GLOB.instrument.isSax ? 2 : 1
MainScore {
id: score
height: nootkaWindow.height - (header ? header.height : 0) - (GLOB.instrument.isSax ? 0 : instrument.height)
width: parent.width - (GLOB.instrument.isSax ? instrument.width : 0)
height: nootkaWindow.height - (header ? header.height : 0) - (GLOB.instrument.isSax ? (GLOB.singleNoteMode ? instrument.height / 7 : 0) : instrument.height)
width: (parent.width - (GLOB.instrument.isSax ? instrument.width : 0)) / (GLOB.singleNoteMode ? 2 : 1)
z: 5
}
Instrument {
id: instrument
z: 1
score: score
}
Loader {
active: GLOB.singleNoteMode
source: "qrc:/NoteName.qml"
width: score.width
height: score.height
x: score.width + 1
z: 5
onLoaded: {
item.note = Qt.binding(function() { return score.note })
item.onNoteChanged.connect(function() { score.setNote(score.scoreObj.note(0), item.note) })
}
}
Component.onCompleted: {
......
......@@ -17,6 +17,9 @@ Item {
height: GLOB.instrument.isSax ? parent.height : Math.max(parent.height / GLOB.instrument.heightPart, nootkaWindow.fontSize * 12)
width: parent.width * (GLOB.instrument.isSax ? 0.15 : 1)
y: GLOB.instrument.isSax ? 0 : score.height + 1
x: GLOB.instrument.isSax ? parent.width - width : 0
z: 1
Loader {
id: instrLoad
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment