feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Hotfix for ColorButton

Browse Source 
Instead of a shader I use canvas.
I had to rotate the color box to be able to use gradients.
This is working around QTBUG-56639.

Change-Id: Id321311713029d8aa66e068b02361d86debfa666
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2016-10-21 13:53:01 +02:00
parent f69518641f
commit 0f5f0c138c
1 changed files with 22 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
View File

@@ -133,62 +133,35 @@ Item {
fillMode: Image.Tile fillMode: Image.Tile
// note we smoothscale the shader from a smaller version to improve performance // note we smoothscale the shader from a smaller version to improve performance
ShaderEffect { Canvas {
id: map id: hubeBox
opacity: colorButton.alpha opacity: colorButton.alpha
scale: surround.width / width;
layer.enabled: true
layer.smooth: true
anchors.fill: parent anchors.fill: parent
property real hue: colorButton.hue property real hue: colorButton.hue
onHueChanged: requestPaint()
fragmentShader: " onPaint: {
varying mediump vec2 qt_TexCoord0; var ctx = hubeBox.getContext('2d')
uniform highp float qt_Opacity;
uniform highp float hue;
highp float hueToIntensity(highp float v1, highp float v2, highp float h) { ctx.save()
h = fract(h);
if (h < 1.0 / 6.0)
return v1 + (v2 - v1) * 6.0 * h;
else if (h < 1.0 / 2.0)
return v2;
else if (h < 2.0 / 3.0)
return v1 + (v2 - v1) * 6.0 * (2.0 / 3.0 - h);
return v1; ctx.clearRect(0, 0, hubeBox.width, hubeBox.height);
}
highp vec3 HSLtoRGB(highp vec3 color) { for (var row = 0; row < hubeBox.height; row++){
highp float h = color.x; var gradient = ctx.createLinearGradient(0, 0, hubeBox.width,0);
highp float l = color.z; var l = Math.abs(row - hubeBox.height) / hubeBox.height
highp float s = color.y;
if (s < 1.0 / 256.0) gradient.addColorStop(0, Qt.hsla(hubeBox.hue, 0, l, 1));
return vec3(l, l, l); gradient.addColorStop(1, Qt.hsla(hubeBox.hue, 1, l, 1));
highp float v1; ctx.fillStyle = gradient;
highp float v2; ctx.fillRect(0, row, hubeBox.width, 1);
if (l < 0.5) }
v2 = l * (1.0 + s);
else
v2 = (l + s) - (s * l);
v1 = 2.0 * l - v2; ctx.restore()
highp float d = 1.0 / 3.0; }
highp float r = hueToIntensity(v1, v2, h + d);
highp float g = hueToIntensity(v1, v2, h);
highp float b = hueToIntensity(v1, v2, h - d);
return vec3(r, g, b);
}
void main() {
lowp vec4 c = vec4(1.0);
c.rgb = HSLtoRGB(vec3(hue, 1.0 - qt_TexCoord0.t, qt_TexCoord0.s));
gl_FragColor = c * qt_Opacity;
}
"
} }
Canvas { Canvas {
@@ -215,9 +188,8 @@ Item {
context.clearRect(0, 0, canvas.width, canvas.height); context.clearRect(0, 0, canvas.width, canvas.height);
var yy = canvas.height - colorButton.saturation * canvas.height var yy = canvas.height -colorButton.lightness * canvas.height
var xx = colorButton.saturation * canvas.width
var xx = colorButton.lightness * canvas.width
ctx.strokeStyle = canvas.strokeStyle ctx.strokeStyle = canvas.strokeStyle
ctx.lineWidth = 1 ctx.lineWidth = 1
@@ -245,13 +217,9 @@ Item {
if (pressed) { if (pressed) {
var xx = Math.max(0, Math.min(mouse.x, parent.width)) var xx = Math.max(0, Math.min(mouse.x, parent.width))
var yy = Math.max(0, Math.min(mouse.y, parent.height)) var yy = Math.max(0, Math.min(mouse.y, parent.height))
//saturationSlider.value = 1.0 - yy / parent.height
//lightnessSlider.value = xx / parent.width colorButton.lightness = 1.0 - yy / parent.height;
//var myHue = colorButton.hue colorButton.saturation = xx / parent.width;
colorButton.saturation = 1.0 - yy / parent.height;
colorButton.lightness = xx / parent.width;
//colorButton.hue = myHue
//colorButton.color = Qt.hsla(colorButton.hue, 1.0 - yy / parent.height, xx / parent.width, colorButton.alpha)
} }
} }
onPressed: positionChanged(mouse) onPressed: positionChanged(mouse)