mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Support alpha in backgroundColor

Browse source
This commit is contained in:
evgenyzinoviev 2016-01-23 00:54:43 +01:00
parent 9b28b0e943
commit 2fcd3ce7cd
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window.cc
View file

@ -552,11 +552,11 @@ void NativeWindow::OnCapturePageDone(const CapturePageCallback& callback,
} }
SkColor NativeWindow::ParseHexColor(const std::string& name) { SkColor NativeWindow::ParseHexColor(const std::string& name) {
SkColor result = 0xFF000000;
unsigned value = 0;
auto color = name.substr(1); auto color = name.substr(1);
unsigned length = color.size(); unsigned length = color.size();
if (length != 3 && length != 6) SkColor result = (length != 8 ? 0xFF000000 : 0x00000000);
unsigned value = 0;
if (length != 3 && length != 6 && length != 8)
return result; return result;
for (unsigned i = 0; i < length; ++i) { for (unsigned i = 0; i < length; ++i) {
if (!base::IsHexDigit(color[i])) if (!base::IsHexDigit(color[i]))
@ -564,7 +564,7 @@ SkColor NativeWindow::ParseHexColor(const std::string& name) {
value <<= 4; value <<= 4;
value |= (color[i] < 'A' ? color[i] - '0' : (color[i] - 'A' + 10) & 0xF); value |= (color[i] < 'A' ? color[i] - '0' : (color[i] - 'A' + 10) & 0xF);
} }
if (length == 6) { if (length == 6 || length == 8) {
result |= value; result |= value;
return result; return result;
} }

2
atom/browser/native_window_mac.mm
View file

@ -710,7 +710,7 @@ void NativeWindowMac::SetBackgroundColor(const std::string& color_name) {
NSColor *color = [NSColor colorWithCalibratedRed:SkColorGetR(background_color) NSColor *color = [NSColor colorWithCalibratedRed:SkColorGetR(background_color)
green:SkColorGetG(background_color) green:SkColorGetG(background_color)
blue:SkColorGetB(background_color) blue:SkColorGetB(background_color)
alpha:1.0]; alpha:SkColorGetA(background_color)/255.0f];
[window_ setBackgroundColor:color]; [window_ setBackgroundColor:color];
} }