Title: [164311] trunk/Source/WebInspectorUI
- Revision
- 164311
- Author
- grao...@webkit.org
- Date
- 2014-02-18 13:41:11 -0800 (Tue, 18 Feb 2014)
Log Message
Web Inspector: Editing transparent color shows incorrect opacity slider
https://bugs.webkit.org/show_bug.cgi?id=128975
Reviewed by Joseph Pecoraro.
The opacity slider should show a range of colors from transparent to the full opacity of the tinted color.
* UserInterface/ColorPicker.js:
(WebInspector.ColorPicker.prototype._updateSliders):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (164310 => 164311)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-18 21:27:03 UTC (rev 164310)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-18 21:41:11 UTC (rev 164311)
@@ -1,3 +1,15 @@
+2014-02-18 Antoine Quint <grao...@webkit.org>
+
+ Web Inspector: Editing transparent color shows incorrect opacity slider
+ https://bugs.webkit.org/show_bug.cgi?id=128975
+
+ Reviewed by Joseph Pecoraro.
+
+ The opacity slider should show a range of colors from transparent to the full opacity of the tinted color.
+
+ * UserInterface/ColorPicker.js:
+ (WebInspector.ColorPicker.prototype._updateSliders):
+
2014-02-18 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: shift-clicking #fff swatch results in bad rgb value
Modified: trunk/Source/WebInspectorUI/UserInterface/ColorPicker.js (164310 => 164311)
--- trunk/Source/WebInspectorUI/UserInterface/ColorPicker.js 2014-02-18 21:27:03 UTC (rev 164310)
+++ trunk/Source/WebInspectorUI/UserInterface/ColorPicker.js 2014-02-18 21:41:11 UTC (rev 164311)
@@ -135,10 +135,11 @@
_updateSliders: function(rawColor, tintedColor)
{
- var rgba = this._colorWheel.tintedColor.rgb.concat(0);
- var transparent = new WebInspector.Color(WebInspector.Color.Format.RGBA, rgba).toString();
+ var rgb = this._colorWheel.tintedColor.rgb;
+ var opaque = new WebInspector.Color(WebInspector.Color.Format.RGBA, rgb.concat(1)).toString();
+ var transparent = new WebInspector.Color(WebInspector.Color.Format.RGBA, rgb.concat(0)).toString();
- this._opacitySlider.element.style.backgroundImage = "linear-gradient(90deg, " + transparent + ", " + tintedColor + "), " + this._opacityPattern;
+ this._opacitySlider.element.style.backgroundImage = "linear-gradient(90deg, " + transparent + ", " + opaque + "), " + this._opacityPattern;
this._brightnessSlider.element.style.backgroundImage = "linear-gradient(90deg, black, " + rawColor + ")";
}
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
