Commit 909912a9 authored by Samual's avatar Samual

Merge remote-tracking branch 'origin/terencehill/menu_focus_bugfix'

* origin/terencehill/menu_focus_bugfix:
  Fix this bug: If you open up a dialog/menu in game, and then leave focus of the Xonotic window, when you click back onto the Xonotic window it ALWAYS unfocuses the active dialog.
parents ed00b093 0fa5ff39
......@@ -257,6 +257,19 @@ void m_keydown(float key, float ascii)
return;
if(!Menu_Active)
return;
if(menuMouseMode)
if(key >= K_MOUSE1 && key <= K_MOUSE3)
{
// detect a click outside of the game window
vector p = getmousepos();
if(p_x < 0 || p_x > realconwidth || p_y < 0 || p_y > realconheight)
{
++mouseButtonsPressed;
return;
}
}
if(keyGrabber)
{
entity e;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment