Merge with develop

This commit is contained in:
Nimetu 2015-12-10 10:56:53 +02:00
commit ed90e506d1

View file

@ -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;