Skip to content
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

Jump to bottom

fixed Lilypond Lyrics plugin #25673

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −17
Open

fixed Lilypond Lyrics plugin #25673

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
58 changes: 41 additions & 17 deletions share/plugins/lilyrics/lilyrics.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import QtQuick 2.1
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls

import MuseScore 3.0
import Muse.UiComponents 1.0
import Muse.Ui
import Muse.UiComponents

// Inspired by roblyric, by Robbie Matthews

Expand Down Expand Up @@ -57,8 +58,8 @@ MuseScore {
anchors.topMargin: 10
}

TextArea {
id:textLily
Rectangle {

anchors.top: textLabel.bottom
anchors.left: window.left
anchors.right: buttonDump.left
Expand All @@ -67,15 +68,34 @@ MuseScore {
anchors.bottomMargin: 10
anchors.leftMargin: 10
anchors.rightMargin: 5
width: parent.width
wrapMode: TextEdit.WrapAnywhere
textFormat: TextEdit.PlainText
text: ""

color: ui.theme.textFieldColor
border.color: ui.theme.strokeColor
border.width: Math.max(ui.theme.borderWidth, 1)
radius: 3

ScrollView {
id: view

anchors.fill: parent
ScrollBar.vertical.policy: ScrollBar.AlwaysOn

TextArea {
id:textLily
width: parent.width
height: Math.max(textLily.implicitHeight, view.height)
anchors.margins: 8
wrapMode: TextEdit.WrapAnywhere
textFormat: TextEdit.PlainText
selectByMouse: true
text: ""
}
}
}

/******************************************
**************** Buttons ******************
******************************************/
/******************************************
**************** Buttons ******************
******************************************/

// PASTE
FlatButton {
Expand Down Expand Up @@ -241,17 +261,17 @@ MuseScore {
}


/******************************************
*********** Bottom bar controls ***********
******************************************/
/******************************************
*********** Bottom bar controls ***********
******************************************/

Row {
id: bottomBar

spacing: 10

anchors.left: textLily.left
anchors.right: textLily.right
anchors.left: window.left
anchors.right: window.right
anchors.bottom: window.bottom
anchors.margins: 10

Expand Down Expand Up @@ -337,6 +357,8 @@ MuseScore {

checked: true
text: qsTr("Skip ties")

onClicked: checked = !checked
}

CheckBox {
Expand All @@ -346,6 +368,8 @@ MuseScore {

checked: true
text: qsTr("Extender")

onClicked: checked = !checked
}

FlatButton {
Expand Down
2 changes: 2 additions & 0 deletions src/framework/extensions/qml/Muse/Extensions/ExtensionViewerDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ StyledDialogView {
contentWidth: viewer.width
contentHeight: viewer.height

alwaysOnTop: true

ExtensionViewer {
id: viewer

Expand Down