sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-10-31 15:12:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #198 from Swordfish90/fix-color-dialog-2

Browse Source 
Fix bad behaving color dialog on some platforms.
This commit is contained in:
Filippo Scognamiglio
2015-01-02 22:16:33 +01:00
parent c685cbd640 d10bf29493
commit 6979abe96a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/qml/ColorButton.qml
View File

@@ -22,8 +22,10 @@ import QtQuick 2.2
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.1
Item { Item {
id: rootItem
signal colorSelected (color color) signal colorSelected (color color)
property color button_color property color color
property string name property string name
ColorDialog { ColorDialog {
@@ -33,13 +35,13 @@ Item {
visible: false visible: false
//This is a workaround to a Qt 5.2 bug. //This is a workaround to a Qt 5.2 bug.
onCurrentColorChanged: colorDialog.color = colorDialog.currentColor; onColorChanged: if (Qt.platform.os !== "osx") colorSelected(color)
onAccepted: colorSelected(color) onAccepted: if (Qt.platform.os === "osx") colorSelected(color)
} }
Rectangle{ Rectangle{
anchors.fill: parent anchors.fill: parent
radius: 10 radius: 10
color: button_color color: rootItem.color
border.color: "black" border.color: "black"
Glossy {} Glossy {}
Rectangle { Rectangle {
@@ -52,7 +54,7 @@ Item {
Text{ Text{
anchors.centerIn: parent anchors.centerIn: parent
z: parent.z + 1 z: parent.z + 1
text: name + ": " + button_color text: name + ": " + rootItem.color
} }
} }
MouseArea{ MouseArea{

4
app/qml/SettingsTerminalTab.qml
View File

@@ -125,14 +125,14 @@ Tab{
height: 50 height: 50
Layout.fillWidth: true Layout.fillWidth: true
onColorSelected: appSettings._fontColor = color; onColorSelected: appSettings._fontColor = color;
button_color: appSettings._fontColor color: appSettings._fontColor
} }
ColorButton{ ColorButton{
name: qsTr("Background") name: qsTr("Background")
height: 50 height: 50
Layout.fillWidth: true Layout.fillWidth: true
onColorSelected: appSettings._backgroundColor = color; onColorSelected: appSettings._backgroundColor = color;
button_color: appSettings._backgroundColor color: appSettings._backgroundColor
} }
} }
} }