Skip to content
Permalink
Browse files

Close console when it loses focus but it is still on screen

  • Loading branch information
EXio4 authored and kahrl committed Jun 5, 2013
1 parent 4f6bec1 commit 7cb521725569b7eda98af40f7e4b4eb63afff633
Showing with 12 additions and 0 deletions.
  1. +4 −0 src/game.cpp
  2. +5 −0 src/guiChatConsole.cpp
  3. +3 −0 src/guiChatConsole.h
@@ -1684,6 +1684,10 @@ void the_game(
{
input->clear();
}
if (!guienv->hasFocus(gui_chat_console) && gui_chat_console->isOpen())
{
gui_chat_console->closeConsoleAtOnce();
}

// Input handler step() (used by the random input generator)
input->step(dtime);
@@ -134,6 +134,11 @@ void GUIChatConsole::openConsole(f32 height)
reformatConsole();
}

bool GUIChatConsole::isOpen() const
{
return m_open;
}

bool GUIChatConsole::isOpenInhibited() const
{
return m_open_inhibited > 0;
@@ -39,6 +39,9 @@ class GUIChatConsole : public gui::IGUIElement
// This doesn't open immediately but initiates an animation.
// You should call isOpenInhibited() before this.
void openConsole(f32 height);

bool isOpen() const;

// Check if the console should not be opened at the moment
// This is to avoid reopening the console immediately after closing
bool isOpenInhibited() const;

0 comments on commit 7cb5217

Please sign in to comment.