Fix: Window can be moved while menu is open - cont'd (#1166)
This commit is contained in:
parent
4571af24ab
commit
86eaf0f905
@ -1398,11 +1398,6 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
|
||||
break;
|
||||
|
||||
case WM_SETFOCUS:
|
||||
if (Fl::grab() && (Fl::grab() != window) && Fl::grab()->menu_window()) {
|
||||
// simulate click at remote location (see issue #1166)
|
||||
mouse_event(Fl::grab(), 0, 1, MK_LBUTTON, MAKELPARAM(100000, 0));
|
||||
return 0;
|
||||
}
|
||||
if ((Fl::modal_) && (Fl::modal_ != window)) {
|
||||
SetFocus(fl_xid(Fl::modal_));
|
||||
return 0;
|
||||
@ -1411,6 +1406,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
|
||||
break;
|
||||
|
||||
case WM_KILLFOCUS:
|
||||
if (Fl::grab() && (Fl::grab() != window) && Fl::grab()->menu_window()) {
|
||||
// simulate click at remote location (see issue #1166)
|
||||
mouse_event(Fl::grab(), 0, 1, MK_LBUTTON, MAKELPARAM(100000, 0));
|
||||
}
|
||||
Fl::handle(FL_UNFOCUS, window);
|
||||
Fl::flush(); // it never returns to main loop when deactivated...
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user