ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac.drv: Fix setting Cocoa focus when window is shown by other thread. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-08-24 10:14:22 -05:00 committed by Alexandre Julliard
parent fc64e2bfa6
commit f68e131e88
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/winemac.drv/window.c
View File

@ -45,9 +45,6 @@ static CFMutableDictionaryRef win_datas;
static DWORD activate_on_focus_time; static DWORD activate_on_focus_time;
void CDECL macdrv_SetFocus(HWND hwnd);
/*********************************************************************** /***********************************************************************
* get_cocoa_window_features * get_cocoa_window_features
*/ */
@ -833,6 +830,27 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win
} }
/***********************************************************************
* set_focus
*/
static void set_focus(HWND hwnd)
{
struct macdrv_win_data *data;
if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return;
if (!(data = get_win_data(hwnd))) return;
if (data->cocoa_window && data->on_screen)
{
BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000);
/* Set Mac focus */
macdrv_give_cocoa_window_focus(data->cocoa_window, activate);
activate_on_focus_time = 0;
}
release_win_data(data);
}
/*********************************************************************** /***********************************************************************
* show_window * show_window
*/ */
@ -845,7 +863,7 @@ static void show_window(struct macdrv_win_data *data)
macdrv_window prev_window = NULL; macdrv_window prev_window = NULL;
macdrv_window next_window = NULL; macdrv_window next_window = NULL;
BOOL activate = FALSE; BOOL activate = FALSE;
HWND hwndFocus; GUITHREADINFO info;
/* find window that this one must be after */ /* find window that this one must be after */
prev = GetWindow(data->hwnd, GW_HWNDPREV); prev = GetWindow(data->hwnd, GW_HWNDPREV);
@ -869,9 +887,10 @@ static void show_window(struct macdrv_win_data *data)
macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate);
data->on_screen = TRUE; data->on_screen = TRUE;
hwndFocus = GetFocus(); info.cbSize = sizeof(info);
if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) if (GetGUIThreadInfo(GetWindowThreadProcessId(data->hwnd, NULL), &info) && info.hwndFocus &&
macdrv_SetFocus(hwndFocus); (data->hwnd == info.hwndFocus || IsChild(data->hwnd, info.hwndFocus)))
set_focus(info.hwndFocus);
if (activate) if (activate)
activate_on_focus_time = 0; activate_on_focus_time = 0;
} }
@ -1495,25 +1514,12 @@ void CDECL macdrv_DestroyWindow(HWND hwnd)
void CDECL macdrv_SetFocus(HWND hwnd) void CDECL macdrv_SetFocus(HWND hwnd)
{ {
struct macdrv_thread_data *thread_data = macdrv_thread_data(); struct macdrv_thread_data *thread_data = macdrv_thread_data();
struct macdrv_win_data *data;
TRACE("%p\n", hwnd); TRACE("%p\n", hwnd);
if (!thread_data) return; if (!thread_data) return;
thread_data->dead_key_state = 0; thread_data->dead_key_state = 0;
set_focus(hwnd);
if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return;
if (!(data = get_win_data(hwnd))) return;
if (data->cocoa_window && data->on_screen)
{
BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000);
/* Set Mac focus */
macdrv_give_cocoa_window_focus(data->cocoa_window, activate);
activate_on_focus_time = 0;
}
release_win_data(data);
} }