Merge with develop
This commit is contained in:
commit
ed90e506d1
1 changed files with 4 additions and 0 deletions
|
@ -2623,6 +2623,10 @@ namespace NLGUI
|
||||||
|
|
||||||
// If the mouse is over a window, always consider the event is taken (avoid click behind)
|
// If the mouse is over a window, always consider the event is taken (avoid click behind)
|
||||||
handled|= isMouseOverWindow();
|
handled|= isMouseOverWindow();
|
||||||
|
|
||||||
|
// If mouse click was not on interface and we have keyboard captured, then release keyboard
|
||||||
|
if (!handled && getCaptureKeyboard() != NULL && eventDesc.getEventTypeExtended() != CEventDescriptorMouse::mousemove)
|
||||||
|
CWidgetManager::getInstance()->setCaptureKeyboard(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return handled;
|
return handled;
|
||||||
|
|
Loading…
Reference in a new issue