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

Set the backgroundColor of RenderWidgetHostView

Browse source
This commit is contained in:
Cheng Zhao 2016-04-14 21:52:17 +09:00
parent 7501a02b34
commit b84a178ceb
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_web_contents.cc
View file

@ -20,6 +20,7 @@
#include "atom/browser/web_view_guest_delegate.h" #include "atom/browser/web_view_guest_delegate.h"
#include "atom/common/api/api_messages.h" #include "atom/common/api/api_messages.h"
#include "atom/common/api/event_emitter_caller.h" #include "atom/common/api/event_emitter_caller.h"
#include "atom/common/color_util.h"
#include "atom/common/mouse_util.h" #include "atom/common/mouse_util.h"
#include "atom/common/native_mate_converters/blink_converter.h" #include "atom/common/native_mate_converters/blink_converter.h"
#include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/callback.h"
@ -747,12 +748,19 @@ void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE; params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
web_contents()->GetController().LoadURLWithParams(params); web_contents()->GetController().LoadURLWithParams(params);
// Set the background color of RenderViewHost to transparent so it doesn't // Set the background color of RenderWidgetHostView.
// override the background color set by the user.
// We have to call it right after LoadURL because the RenderViewHost is only // We have to call it right after LoadURL because the RenderViewHost is only
// created after loading a page. // created after loading a page.
const auto view = web_contents()->GetRenderWidgetHostView(); const auto view = web_contents()->GetRenderWidgetHostView();
view->SetBackgroundColor(SK_ColorTRANSPARENT); WebContentsPreferences* web_preferences =
WebContentsPreferences::FromWebContents(web_contents());
std::string color_name;
if (web_preferences->web_preferences()->GetString(options::kBackgroundColor,
&color_name)) {
view->SetBackgroundColor(ParseHexColor(color_name));
} else {
view->SetBackgroundColor(SK_ColorTRANSPARENT);
}
// For the same reason we can only disable hidden here. // For the same reason we can only disable hidden here.
const auto host = static_cast<content::RenderWidgetHostImpl*>( const auto host = static_cast<content::RenderWidgetHostImpl*>(

11
atom/browser/native_window_mac.mm
View file

@ -807,9 +807,14 @@ bool NativeWindowMac::IsKiosk() {
} }
void NativeWindowMac::SetBackgroundColor(const std::string& color_name) { void NativeWindowMac::SetBackgroundColor(const std::string& color_name) {
base::ScopedCFTypeRef<CGColorRef> color = SkColor color = ParseHexColor(color_name);
skia::CGColorCreateFromSkColor(ParseHexColor(color_name)); base::ScopedCFTypeRef<CGColorRef> cgcolor =
[[[window_ contentView] layer] setBackgroundColor:color]; skia::CGColorCreateFromSkColor(color);
[[[window_ contentView] layer] setBackgroundColor:cgcolor];
const auto view = web_contents()->GetRenderWidgetHostView();
if (view)
view->SetBackgroundColor(color);
} }
void NativeWindowMac::SetHasShadow(bool has_shadow) { void NativeWindowMac::SetHasShadow(bool has_shadow) {