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

Merge branch 'bg-color-pr' of https://github.com/evgenyzinoviev/electron

Browse source
This commit is contained in:
Cheng Zhao 2016-01-24 21:33:53 +08:00
commit 7761815339
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window.cc
View file

@ -560,11 +560,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]))
@ -572,7 +572,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

@ -758,7 +758,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];
} }

5
docs/api/browser-window.md
View file

@ -83,8 +83,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
* `enableLargerThanScreen` Boolean - Enable the window to be resized larger * `enableLargerThanScreen` Boolean - Enable the window to be resized larger
than screen. Default is `false`. than screen. Default is `false`.
* `backgroundColor` String - Window's background color as Hexadecimal value, * `backgroundColor` String - Window's background color as Hexadecimal value,
like `#66CD00` or `#FFF`. Default is `#000` (black) for Linux and Windows, like `#66CD00` or `#FFF` or `#80FFFFFF` (alpha is supported). Default is
`#FFF` for Mac (or clear if transparent). `#000` (black) for Linux and Windows, `#FFF` for Mac (or clear if
transparent).
* `hasShadow` Boolean - Whether window should have a shadow. This is only * `hasShadow` Boolean - Whether window should have a shadow. This is only
implemented on OS X. Default is `true`. implemented on OS X. Default is `true`.
* `darkTheme` Boolean - Forces using dark theme for the window, only works on * `darkTheme` Boolean - Forces using dark theme for the window, only works on