1 Commits

Author SHA1 Message Date
Filippo Scognamiglio
d10bf29493 Fix bad behaving color dialog on some platforms. 2014-12-30 10:25:33 +01:00
2 changed files with 11 additions and 11 deletions

View File

@@ -23,7 +23,9 @@ import QtQuick.Dialogs 1.1
Item {
id: rootItem
property alias color: colorDialog.color
signal colorSelected (color color)
property color color
property string name
ColorDialog {
@@ -31,6 +33,10 @@ Item {
title: qsTr("Choose a color")
modality: Qt.ApplicationModal
visible: false
//This is a workaround to a Qt 5.2 bug.
onColorChanged: if (Qt.platform.os !== "osx") colorSelected(color)
onAccepted: if (Qt.platform.os === "osx") colorSelected(color)
}
Rectangle{
anchors.fill: parent

View File

@@ -121,24 +121,18 @@ Tab{
RowLayout{
Layout.fillWidth: true
ColorButton{
property color settingsColor: appSettings._fontColor
onSettingsColorChanged: color = settingsColor
name: qsTr("Font")
height: 50
Layout.fillWidth: true
onColorChanged: appSettings._fontColor = color
Component.onCompleted: { color = settingsColor; }
onColorSelected: appSettings._fontColor = color;
color: appSettings._fontColor
}
ColorButton{
property color settingsColor: appSettings._backgroundColor
onSettingsColorChanged: color = settingsColor
name: qsTr("Background")
height: 50
Layout.fillWidth: true
onColorChanged: appSettings._backgroundColor = color
Component.onCompleted: { color = settingsColor;}
onColorSelected: appSettings._backgroundColor = color;
color: appSettings._backgroundColor
}
}
}