jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win-capture: Fix bug calculating cursor position

Browse Source 
Cursor position calculation was not taking in to account the window
client coordinates relative to the screen.
This commit is contained in:
jp9000
2014-06-14 23:49:35 -07:00
parent 44066f8e61
commit 8ab1bc8e7b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/win-capture/dc-capture.c
View File

@@ -86,11 +86,12 @@ void dc_capture_free(struct dc_capture *capture)
memset(capture, 0, sizeof(struct dc_capture));
}
static void draw_cursor(struct dc_capture *capture, HDC hdc)
static void draw_cursor(struct dc_capture *capture, HDC hdc, HWND window)
{
HICON icon;
ICONINFO ii;
HICON icon;
ICONINFO ii;
CURSORINFO *ci = &capture->ci;
POINT win_pos = {capture->x, capture->y};
if (!(capture->ci.flags & CURSOR_SHOWING))
return;
@@ -101,8 +102,12 @@ static void draw_cursor(struct dc_capture *capture, HDC hdc)
if (GetIconInfo(icon, &ii)) {
POINT pos;
pos.x = ci->ptScreenPos.x - (int)ii.xHotspot - capture->x;
pos.y = ci->ptScreenPos.y - (int)ii.yHotspot - capture->y;
if (window)
ClientToScreen(window, &win_pos);
pos.x = ci->ptScreenPos.x - (int)ii.xHotspot - win_pos.x;
pos.y = ci->ptScreenPos.y - (int)ii.yHotspot - win_pos.y;
DrawIcon(hdc, pos.x, pos.y, icon);
@@ -163,7 +168,7 @@ void dc_capture_capture(struct dc_capture *capture, HWND window)
ReleaseDC(NULL, hdc_target);
if (capture->cursor_captured)
draw_cursor(capture, hdc);
draw_cursor(capture, hdc, window);
dc_capture_release_dc(capture);