diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-09-02 13:48:07 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-09-02 13:48:07 (GMT) |
| commit | f44aa5c0157a509a8242a1fdf2813f3cae6eef27 (patch) | |
| tree | 24d9aa4502fb83c853046bece8f3e7a2fb8d4c60 /generic/tkPointer.c | |
| parent | 06d12e69e9974547cb077ad90a2fbff640b8d5ee (diff) | |
| parent | 6a358e30155c94e44a4fd964ac793161cbc36164 (diff) | |
| download | tk-f44aa5c0157a509a8242a1fdf2813f3cae6eef27.zip tk-f44aa5c0157a509a8242a1fdf2813f3cae6eef27.tar.gz tk-f44aa5c0157a509a8242a1fdf2813f3cae6eef27.tar.bz2 | |
Merge recent fixes for macOS into release branch from core-8-6-branch
Diffstat (limited to 'generic/tkPointer.c')
| -rw-r--r-- | generic/tkPointer.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tkPointer.c b/generic/tkPointer.c index de9d49d..f764904 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.c @@ -503,7 +503,15 @@ TkPointerDeadWindow( tsdPtr->restrictWinPtr = NULL; } if (!(tsdPtr->restrictWinPtr || tsdPtr->grabWinPtr)) { - TkpSetCapture(NULL); + + /* + * Release mouse capture only if the dead window is the capturing + * window. + */ + + if (winPtr == (TkWindow *)TkpGetCapture()) { + TkpSetCapture(NULL); + } } } |