mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Fixed text decoration tests, Color will now store just a single argb info in 32bit unsigned int internally and covert to a/r/g/b or hex when necessary
This commit is contained in:
committed by
Panayot Cankov
parent
ccde2a4083
commit
b2cf286948
@@ -14,7 +14,7 @@ export var test_Hex_Color = function () {
|
||||
TKUnit.assertEqual(color.g, 0, "Color.g not properly parsed");
|
||||
TKUnit.assertEqual(color.b, 0, "Color.b not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, "#FF0000", "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, _parseArgb(255, 255, 0, 0), "Color.argb not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, 0xFFFF0000, "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
export var test_ShortHex_Color = function () {
|
||||
@@ -27,7 +27,7 @@ export var test_ShortHex_Color = function () {
|
||||
TKUnit.assertEqual(color.g, 136, "Color.g not properly parsed"); // 0x88 == 136
|
||||
TKUnit.assertEqual(color.b, 0, "Color.b not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, "#FF8800", "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, _parseArgb(255, 255, 136, 0), "Color.argb not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, 0xFFFF8800, "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
export var test_Argb_Color = function () {
|
||||
@@ -39,22 +39,21 @@ export var test_Argb_Color = function () {
|
||||
TKUnit.assertEqual(color.r, 255, "Color.r not properly parsed");
|
||||
TKUnit.assertEqual(color.g, 100, "Color.g not properly parsed");
|
||||
TKUnit.assertEqual(color.b, 100, "Color.b not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, _buildHex(100, 255, 100, 100), "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, _parseArgb(100, 255, 100, 100), "Color.argb not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, "#64FF6464", "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, 0x64FF6464, "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
export var test_ArgbInt_Color = function () {
|
||||
// >> color-rgb-single
|
||||
// Creates the color with 100 alpha, 100 red, 100 green, 100 blue
|
||||
var argb = (100 << 24) | (100 << 16) | (100 << 8) | 100;
|
||||
var color = new Color(argb);
|
||||
var color = new Color(0x64646464);
|
||||
// << color-rgb-single
|
||||
TKUnit.assertEqual(color.a, 100, "Color.a not properly parsed");
|
||||
TKUnit.assertEqual(color.r, 100, "Color.r not properly parsed");
|
||||
TKUnit.assertEqual(color.g, 100, "Color.g not properly parsed");
|
||||
TKUnit.assertEqual(color.b, 100, "Color.b not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, _buildHex(100, 100, 100, 100), "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, _parseArgb(100, 100, 100, 100), "Color.argb not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, "#64646464", "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, 0x64646464, "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
export var test_rgb_Color_CSS = function () {
|
||||
@@ -69,13 +68,13 @@ export var test_rgb_Color_CSS = function () {
|
||||
TKUnit.assertEqual(color.r, 255, "Color.r not properly parsed");
|
||||
TKUnit.assertEqual(color.g, 100, "Color.g not properly parsed");
|
||||
TKUnit.assertEqual(color.b, 100, "Color.b not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, _buildHex(255, 255, 100, 100), "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, _parseArgb(255, 255, 100, 100), "Color.argb not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, "#FF6464", "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, 0xFFFF6464, "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
export var test_rgba_Color_CSS = function () {
|
||||
var alpha = 0.5;
|
||||
var expected = Math.round(alpha * 255);
|
||||
var expected = 0x80;
|
||||
// <snippet module="color" title="color">
|
||||
// ### Creating a Color from four RGB values
|
||||
// ``` JavaScript
|
||||
@@ -87,24 +86,6 @@ export var test_rgba_Color_CSS = function () {
|
||||
TKUnit.assertEqual(color.r, 255, "Color.r not properly parsed");
|
||||
TKUnit.assertEqual(color.g, 100, "Color.g not properly parsed");
|
||||
TKUnit.assertEqual(color.b, 100, "Color.b not properly parsed");
|
||||
TKUnit.assertEqual(color.hex, _buildHex(expected, 255, 100, 100), "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, _parseArgb(expected, 255, 100, 100), "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
var _buildHex = function (a: number, r: number, g: number, b: number): string {
|
||||
return "#" + _componentToHex(a) + _componentToHex(r) + _componentToHex(g) + _componentToHex(b);
|
||||
}
|
||||
|
||||
var _componentToHex = function (component: number): string {
|
||||
var hex = component.toString(16);
|
||||
if (hex.length === 1) {
|
||||
hex = "0" + hex;
|
||||
}
|
||||
|
||||
return hex;
|
||||
}
|
||||
|
||||
var _parseArgb = function (a: number, r: number, g: number, b: number): number {
|
||||
// Format is ARGB, so alpha takes the first 8 bits, red the next, green the next and the last 8 bits are for the blue component
|
||||
return (a << 24) | (r << 16) | (g << 8) | b;
|
||||
TKUnit.assertEqual(color.hex, "#80FF6464", "Color.hex not properly parsed");
|
||||
TKUnit.assertEqual(color.argb, 0x80FF6464, "Color.argb not properly parsed");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user