Skip to content

Commit 3916fb8

Browse files
committed
[4.4.4] fixed Lilypond Lyrics plugin
1 parent 0c67d1e commit 3916fb8

File tree

2 files changed

+44
-18
lines changed

2 files changed

+44
-18
lines changed

share/plugins/lilyrics/lilyrics.qml

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import QtQuick 2.1
2-
import QtQuick.Controls 2.15
1+
import QtQuick
2+
import QtQuick.Controls
33

44
import MuseScore 3.0
5-
import Muse.UiComponents 1.0
5+
import Muse.Ui
6+
import Muse.UiComponents
67

78
// Inspired by roblyric, by Robbie Matthews
89

@@ -57,8 +58,8 @@ MuseScore {
5758
anchors.topMargin: 10
5859
}
5960

60-
TextArea {
61-
id:textLily
61+
Rectangle {
62+
6263
anchors.top: textLabel.bottom
6364
anchors.left: window.left
6465
anchors.right: buttonDump.left
@@ -67,15 +68,35 @@ MuseScore {
6768
anchors.bottomMargin: 10
6869
anchors.leftMargin: 10
6970
anchors.rightMargin: 5
70-
width: parent.width
71-
wrapMode: TextEdit.WrapAnywhere
72-
textFormat: TextEdit.PlainText
73-
text: ""
71+
72+
color: ui.theme.textFieldColor
73+
border.color: ui.theme.strokeColor
74+
border.width: Math.max(ui.theme.borderWidth, 1)
75+
radius: 3
76+
77+
ScrollView {
78+
id: view
79+
80+
anchors.fill: parent
81+
//! Bad work for Mac
82+
//ScrollBar.vertical.policy: ScrollBar.AlwaysOn
83+
84+
TextArea {
85+
id:textLily
86+
width: parent.width
87+
height: Math.max(textLily.implicitHeight, view.height)
88+
anchors.margins: 8
89+
wrapMode: TextEdit.WrapAnywhere
90+
textFormat: TextEdit.PlainText
91+
selectByMouse: true
92+
text: ""
93+
}
94+
}
7495
}
7596

76-
/******************************************
77-
**************** Buttons ******************
78-
******************************************/
97+
/******************************************
98+
**************** Buttons ******************
99+
******************************************/
79100

80101
// PASTE
81102
FlatButton {
@@ -241,17 +262,17 @@ MuseScore {
241262
}
242263

243264

244-
/******************************************
245-
*********** Bottom bar controls ***********
246-
******************************************/
265+
/******************************************
266+
*********** Bottom bar controls ***********
267+
******************************************/
247268

248269
Row {
249270
id: bottomBar
250271

251272
spacing: 10
252273

253-
anchors.left: textLily.left
254-
anchors.right: textLily.right
274+
anchors.left: window.left
275+
anchors.right: window.right
255276
anchors.bottom: window.bottom
256277
anchors.margins: 10
257278

@@ -337,6 +358,8 @@ MuseScore {
337358

338359
checked: true
339360
text: qsTr("Skip ties")
361+
362+
onClicked: checked = !checked
340363
}
341364

342365
CheckBox {
@@ -346,6 +369,8 @@ MuseScore {
346369

347370
checked: true
348371
text: qsTr("Extender")
372+
373+
onClicked: checked = !checked
349374
}
350375

351376
FlatButton {
@@ -844,4 +869,3 @@ MuseScore {
844869
}
845870

846871
}
847-

src/framework/extensions/qml/Muse/Extensions/ExtensionViewerDialog.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ StyledDialogView {
3434
contentWidth: viewer.width
3535
contentHeight: viewer.height
3636

37+
alwaysOnTop: true
38+
3739
ExtensionViewer {
3840
id: viewer
3941

0 commit comments

Comments
 (0)