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

EXio4 · kahrl · commit 7cb521725569 · 2013-06-05T21:14:14.000+02:00
diff --git a/src/game.cpp b/src/game.cpp
@@ -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);
diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
@@ -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;
diff --git a/src/guiChatConsole.h b/src/guiChatConsole.h
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1684,6 +1684,10 @@ void the_game(`
`1684`	`1684`	`{`
`1685`	`1685`	`input->clear();`
`1686`	`1686`	`}`
	`1687`	`+ if (!guienv->hasFocus(gui_chat_console) && gui_chat_console->isOpen())`
	`1688`	`+ {`
	`1689`	`+ gui_chat_console->closeConsoleAtOnce();`
	`1690`	`+ }`
`1687`	`1691`
`1688`	`1692`	`// Input handler step() (used by the random input generator)`
`1689`	`1693`	`input->step(dtime);`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,11 @@ void GUIChatConsole::openConsole(f32 height)`
`134`	`134`	`reformatConsole();`
`135`	`135`	`}`
`136`	`136`
	`137`	`+bool GUIChatConsole::isOpen() const`
	`138`	`+{`
	`139`	`+ return m_open;`
	`140`	`+}`
	`141`	`+`
`137`	`142`	`bool GUIChatConsole::isOpenInhibited() const`
`138`	`143`	`{`
`139`	`144`	`return m_open_inhibited > 0;`