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
No related branches found
No related tags found
No related merge requests found
...@@ -66,22 +66,29 @@ ApplicationWindow { ...@@ -66,22 +66,29 @@ ApplicationWindow {
MainMenu { id: mainMenu } MainMenu { id: mainMenu }
header: mainMenu.toolBar header: mainMenu.toolBar
Grid { MainScore {
anchors.fill: parent id: score
columns: GLOB.instrument.isSax ? 2 : 1 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
}
MainScore { Instrument {
id: score id: instrument
height: nootkaWindow.height - (header ? header.height : 0) - (GLOB.instrument.isSax ? 0 : instrument.height) score: score
width: parent.width - (GLOB.instrument.isSax ? instrument.width : 0) }
z: 5
}
Instrument { Loader {
id: instrument active: GLOB.singleNoteMode
z: 1 source: "qrc:/NoteName.qml"
score: score 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: { Component.onCompleted: {
......
...@@ -17,6 +17,9 @@ Item { ...@@ -17,6 +17,9 @@ Item {
height: GLOB.instrument.isSax ? parent.height : Math.max(parent.height / GLOB.instrument.heightPart, nootkaWindow.fontSize * 12) 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) 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 { Loader {
id: instrLoad id: instrLoad
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment