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

Allow devtools window to show on other screens

Browse source
This commit is contained in:
Cheng Zhao 2016-07-11 15:08:39 +09:00
parent 6dfd0518cd
commit f6171c53ca
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -91,6 +91,14 @@ bool IsPointInRect(const gfx::Point& point, const gfx::Rect& rect) {
point.y() > rect.y() && point.y() < (rect.height() + rect.y()); point.y() > rect.y() && point.y() < (rect.height() + rect.y());
} }
bool IsPointInScreen(const gfx::Point& point) {
for (const auto& display : gfx::Screen::GetScreen()->GetAllDisplays()) {
if (IsPointInRect(point, display.bounds()))
return true;
}
return false;
}
void SetZoomLevelForWebContents(content::WebContents* web_contents, void SetZoomLevelForWebContents(content::WebContents* web_contents,
double level) { double level) {
content::HostZoomMap::SetZoomLevel(web_contents, level); content::HostZoomMap::SetZoomLevel(web_contents, level);
@ -214,9 +222,9 @@ InspectableWebContentsImpl::InspectableWebContentsImpl(
devtools_bounds_.set_height(600); devtools_bounds_.set_height(600);
devtools_bounds_.set_width(800); devtools_bounds_.set_width(800);
} }
gfx::Rect display = gfx::Screen::GetScreen() if (!IsPointInScreen(devtools_bounds_.origin())) {
->GetDisplayNearestWindow(web_contents->GetNativeView()).bounds(); gfx::Rect display = gfx::Screen::GetScreen()->
if (!IsPointInRect(devtools_bounds_.origin(), display)) { GetDisplayNearestWindow(web_contents->GetNativeView()).bounds();
devtools_bounds_.set_x(display.x() + (display.width() - devtools_bounds_.width()) / 2); devtools_bounds_.set_x(display.x() + (display.width() - devtools_bounds_.width()) / 2);
devtools_bounds_.set_y(display.y() + (display.height() - devtools_bounds_.height()) / 2); devtools_bounds_.set_y(display.y() + (display.height() - devtools_bounds_.height()) / 2);
} }