diff --git a/AppKit/CPColor.j b/AppKit/CPColor.j index ee14fb397..b6eda360c 100644 --- a/AppKit/CPColor.j +++ b/AppKit/CPColor.j @@ -459,7 +459,7 @@ var cachedBlackColor, { _patternImage = anImage; _cssString = "url(\"" + [_patternImage filename] + "\")"; - _components = []; + _components = [0.0, 0.0, 0.0, 1.0]; } return self; @@ -478,7 +478,7 @@ var cachedBlackColor, */ - (float)alphaComponent { - return _components[3] || 0.0; + return _components[3]; } /*! @@ -486,7 +486,7 @@ var cachedBlackColor, */ - (float)blueComponent { - return _components[2] || 0.0; + return _components[2]; } /*! @@ -494,7 +494,7 @@ var cachedBlackColor, */ - (float)greenComponent { - return _components[1] || 0.0; + return _components[1]; } /*! @@ -502,7 +502,7 @@ var cachedBlackColor, */ - (float)redComponent { - return _components[0] || 0.0; + return _components[0]; } /*! diff --git a/AppKit/CPView.j b/AppKit/CPView.j index 3b3fa55ca..7b1bded96 100644 --- a/AppKit/CPView.j +++ b/AppKit/CPView.j @@ -1322,7 +1322,7 @@ var CPViewFlags = { }, #if PLATFORM(DOM) var patternImage = [_backgroundColor patternImage], - colorExists = _backgroundColor && [_backgroundColor alphaComponent] > 0.0, + colorExists = _backgroundColor && ([_backgroundColor patternImage] || [_backgroundColor alphaComponent] > 0.0), colorHasAlpha = colorExists && [_backgroundColor alphaComponent] < 1.0, supportsRGBA = CPFeatureIsCompatible(CPCSSRGBAFeature), colorNeedsDOMElement = colorHasAlpha && !supportsRGBA,