some minor styling fixes
This commit is contained in:
parent
5a16d3ebdc
commit
6001eccc1d
4 changed files with 27 additions and 8 deletions
|
@ -45,3 +45,5 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
|
||||||
ANDROID_ABIS = \
|
ANDROID_ABIS = \
|
||||||
armeabi-v7a
|
armeabi-v7a
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ANDROID_ABIS = armeabi-v7a
|
||||||
|
|
|
@ -8,7 +8,7 @@ Item {
|
||||||
property bool raised: false
|
property bool raised: false
|
||||||
property alias mouseArea: mouseArea
|
property alias mouseArea: mouseArea
|
||||||
property string text: ""
|
property string text: ""
|
||||||
property string color: "#fcba03"
|
property string color: ""
|
||||||
property bool isDarkColor: control.checkIsDarkColor(color)
|
property bool isDarkColor: control.checkIsDarkColor(color)
|
||||||
property double glowRadius: 0.001
|
property double glowRadius: 0.001
|
||||||
property double glowSpread: 0.2
|
property double glowSpread: 0.2
|
||||||
|
@ -57,8 +57,10 @@ Item {
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
id: contentText
|
id: contentText
|
||||||
anchors.fill: parent
|
anchors.centerIn: background
|
||||||
anchors.margins: parent.height * 0.25
|
|
||||||
|
width: background.width * 0.5
|
||||||
|
height: background.height * 0.7
|
||||||
|
|
||||||
font.pixelSize: height
|
font.pixelSize: height
|
||||||
fontSizeMode: Text.Fit
|
fontSizeMode: Text.Fit
|
||||||
|
|
|
@ -8,6 +8,9 @@ ItemDelegate {
|
||||||
property string value: ""
|
property string value: ""
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
if(value === "")
|
||||||
|
colorPicker.value = "#FFFFFF"
|
||||||
|
else
|
||||||
colorPicker.value = value
|
colorPicker.value = value
|
||||||
textEditDialog.open()
|
textEditDialog.open()
|
||||||
}
|
}
|
||||||
|
@ -22,9 +25,13 @@ ItemDelegate {
|
||||||
width: parent.width * 0.15
|
width: parent.width * 0.15
|
||||||
height: parent.height * 0.6
|
height: parent.height * 0.6
|
||||||
|
|
||||||
color: control.value === "" ? "transparent":control.value
|
color: control.value === "" ? "#FFFFFF":control.value
|
||||||
|
|
||||||
text: value === "" ? "Not set": value
|
text: value === "" ? "Not set": value
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
control.clicked()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
|
@ -44,7 +44,7 @@ ItemDelegate {
|
||||||
|
|
||||||
Chip {
|
Chip {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.preferredWidth: model.scroll ? parent.width * 0.15 : 0
|
Layout.preferredWidth: model.scroll ? control.width * 0.15 : 0
|
||||||
|
|
||||||
visible: model.scroll
|
visible: model.scroll
|
||||||
|
|
||||||
|
@ -57,20 +57,28 @@ ItemDelegate {
|
||||||
}
|
}
|
||||||
|
|
||||||
text: model.scroll ? qsTr("scrolling"):qsTr("false")
|
text: model.scroll ? qsTr("scrolling"):qsTr("false")
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
control.clicked()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Chip {
|
Chip {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.preferredWidth: parent.width * 0.1
|
Layout.preferredWidth: height
|
||||||
|
|
||||||
opacity: model.active ? 1:0.5
|
opacity: model.active ? 1:0.5
|
||||||
|
|
||||||
color: model.color
|
color: model.color
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
control.clicked()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Chip {
|
Chip {
|
||||||
Layout.preferredHeight: parent.height
|
Layout.fillHeight: true
|
||||||
Layout.preferredWidth: parent.width * 0.15
|
Layout.preferredWidth: control.width * 0.15
|
||||||
|
|
||||||
color: model.active ? "#4CAF50" : "#F44336"
|
color: model.active ? "#4CAF50" : "#F44336"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue