Merge pull request #6782 from electron/dip-thumbnail-clip

Convert DIP to screen rect for thumbnail clip
This commit is contained in:
Kevin Sawicki 2016-08-09 09:16:10 -07:00 committed by GitHub
commit ab0d726594

View file

@ -10,6 +10,7 @@
#include "base/win/scoped_gdi_object.h" #include "base/win/scoped_gdi_object.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
#include "ui/display/win/screen_win.h"
#include "ui/gfx/icon_util.h" #include "ui/gfx/icon_util.h"
namespace atom { namespace atom {
@ -167,11 +168,8 @@ bool TaskbarHost::SetThumbnailClip(HWND window, const gfx::Rect& region) {
if (region.IsEmpty()) { if (region.IsEmpty()) {
return SUCCEEDED(taskbar_->SetThumbnailClip(window, NULL)); return SUCCEEDED(taskbar_->SetThumbnailClip(window, NULL));
} else { } else {
RECT rect; RECT rect = display::win::ScreenWin::DIPToScreenRect(window, region)
rect.left = region.x(); .ToRECT();
rect.right = region.right();
rect.top = region.y();
rect.bottom = region.bottom();
return SUCCEEDED(taskbar_->SetThumbnailClip(window, &rect)); return SUCCEEDED(taskbar_->SetThumbnailClip(window, &rect));
} }
} }