Adjust the captured window rect when the window is maximized.
GetWindowRect includes the window frames for maximized window even they are off screen, causing content outside the window being captured falsely. The fix is to remove the left/right/bottom window frame from the captured rect. Mouse capturing is adjusted accordingly as well. BUG=3076 R=sergeyu@chromium.org Review URL: https://webrtc-codereview.appspot.com/10149004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5732 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
45
webrtc/modules/desktop_capture/win/window_capture_utils.cc
Normal file
45
webrtc/modules/desktop_capture/win/window_capture_utils.cc
Normal file
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/modules/desktop_capture/win/window_capture_utils.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
bool
|
||||
GetCroppedWindowRect(HWND window,
|
||||
DesktopRect* cropped_rect,
|
||||
DesktopRect* original_rect) {
|
||||
RECT rect;
|
||||
if (!GetWindowRect(window, &rect)) {
|
||||
return false;
|
||||
}
|
||||
WINDOWPLACEMENT window_placement;
|
||||
if (!GetWindowPlacement(window, &window_placement)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
*original_rect = DesktopRect::MakeLTRB(
|
||||
rect.left, rect.top, rect.right, rect.bottom);
|
||||
|
||||
if (window_placement.showCmd & SW_SHOWMAXIMIZED) {
|
||||
DesktopSize border = DesktopSize(GetSystemMetrics(SM_CXSIZEFRAME),
|
||||
GetSystemMetrics(SM_CYSIZEFRAME));
|
||||
*cropped_rect = DesktopRect::MakeLTRB(
|
||||
rect.left + border.width(),
|
||||
rect.top,
|
||||
rect.right - border.width(),
|
||||
rect.bottom - border.height());
|
||||
} else {
|
||||
*cropped_rect = *original_rect;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
Reference in New Issue
Block a user