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

Merge pull request #3809 from deepak1556/capture_page_api_patch

Browse source 
browser: dont lose coordinates in capturepage src rect
This commit is contained in:
Cheng Zhao 2015-12-15 15:33:02 +08:00
commit 8ddf4da9ad
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window.cc
View file

@ -282,22 +282,22 @@ void NativeWindow::CapturePage(const gfx::Rect& rect,
} }
// Capture full page if user doesn't specify a |rect|. // Capture full page if user doesn't specify a |rect|.
const gfx::Size view_size = rect.IsEmpty() ? view->GetViewBounds().size() : const gfx::Rect view_rect = rect.IsEmpty() ? view->GetViewBounds() :
rect.size(); rect;
// By default, the requested bitmap size is the view size in screen // By default, the requested bitmap size is the view size in screen
// coordinates. However, if there's more pixel detail available on the // coordinates. However, if there's more pixel detail available on the
// current system, increase the requested bitmap size to capture it all. // current system, increase the requested bitmap size to capture it all.
gfx::Size bitmap_size = view_size; gfx::Size bitmap_size = view_rect.size();
const gfx::NativeView native_view = view->GetNativeView(); const gfx::NativeView native_view = view->GetNativeView();
gfx::Screen* const screen = gfx::Screen::GetScreenFor(native_view); gfx::Screen* const screen = gfx::Screen::GetScreenFor(native_view);
const float scale = const float scale =
screen->GetDisplayNearestWindow(native_view).device_scale_factor(); screen->GetDisplayNearestWindow(native_view).device_scale_factor();
if (scale > 1.0f) if (scale > 1.0f)
bitmap_size = gfx::ScaleToCeiledSize(view_size, scale); bitmap_size = gfx::ScaleToCeiledSize(view_rect.size(), scale);
host->CopyFromBackingStore( host->CopyFromBackingStore(
gfx::Rect(view_size), view_rect,
bitmap_size, bitmap_size,
base::Bind(&NativeWindow::OnCapturePageDone, base::Bind(&NativeWindow::OnCapturePageDone,
weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(),