UPBGE: Set the window on top at python interpreter end.

UPBGE · Jul 29, 2016 · 5a35942 · 5a35942
1 parent 5ea4c9b
commit 5a35942
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 0 deletions.
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
@@ -1323,6 +1323,13 @@ void wm_window_testbreak(void)
 	}
 }
 
+void wm_window_set_order(wmWindow *win, int order)
+{
+	if (win->ghostwin) {
+		GHOST_SetWindowOrder(win->ghostwin, (order == 0) ? GHOST_kWindowOrderBottom : GHOST_kWindowOrderTop);
+	}
+}
+
 /* **************** init ********************** */
 
 void wm_ghost_init(bContext *C)

diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h
@@ -71,6 +71,8 @@ void		wm_cursor_position_to_ghost		(wmWindow *win, int *x, int *y);
 
 void		wm_window_testbreak		(void);
 
+void wm_window_set_order(wmWindow *win, int order);
+
 #ifdef WITH_INPUT_IME
 void		wm_window_IME_begin	(wmWindow *win, int x, int y, int w, int h, bool complete);
 void		wm_window_IME_end	(wmWindow *win);

diff --git a/source/gameengine/Launcher/LA_BlenderLauncher.cpp b/source/gameengine/Launcher/LA_BlenderLauncher.cpp
@@ -46,6 +46,7 @@ extern "C" {
 #  include "WM_types.h"
 #  include "WM_api.h"
 #  include "wm_event_system.h"
+#  include "wm_window.h"
 
 #  include "BLI_rect.h"
 }
@@ -154,6 +155,11 @@ void LA_BlenderLauncher::ExitPython()
 #endif  // WITH_PYTHON
 }
 
+void LA_BlenderLauncher::SetWindowOrder(short order)
+{
+	wm_window_set_order(m_window, order);
+}
+
 void LA_BlenderLauncher::InitEngine()
 {
 	// Lock frame and camera enabled - storing global values.

diff --git a/source/gameengine/Launcher/LA_BlenderLauncher.h b/source/gameengine/Launcher/LA_BlenderLauncher.h
@@ -64,6 +64,8 @@ class LA_BlenderLauncher : public LA_Launcher
 	virtual void InitPython();
 	virtual void ExitPython();
 
+	virtual void SetWindowOrder(short order);
+
 public:
 	LA_BlenderLauncher(GHOST_ISystem *system, Main *maggie, Scene *scene, GlobalSettings *gs, RAS_IRasterizer::StereoMode stereoMode, 
 					   int argc, char **argv, bContext *context, rcti *camframe, ARegion *ar, int alwaysUseExpandFraming);

diff --git a/source/gameengine/Launcher/LA_Launcher.cpp b/source/gameengine/Launcher/LA_Launcher.cpp
@@ -373,10 +373,18 @@ void LA_Launcher::HandlePythonConsole()
 		}
 	}
 
+	// Pop the console window for windows.
 	m_system->toggleConsole(1);
+
 	createPythonConsole();
+
+	// Hide the console window for windows.
 	m_system->toggleConsole(0);
 
+	// Set the game engine windows on top of all other and active.
+	SetWindowOrder(1);
+
+
 	/* As we show the console, the release events of the shortcut keys can be not handled by the engine.
 	 * We simulate they them.
 	 */

diff --git a/source/gameengine/Launcher/LA_Launcher.h b/source/gameengine/Launcher/LA_Launcher.h
@@ -125,6 +125,8 @@ class LA_Launcher
 	virtual void InitPython() = 0;
 	virtual void ExitPython() = 0;
 
+	virtual void SetWindowOrder(short order) = 0;
+
 public:
 	LA_Launcher(GHOST_ISystem *system, Main *maggie, Scene *scene, GlobalSettings *gs, RAS_IRasterizer::StereoMode stereoMode, int argc, char **argv);
 	virtual ~LA_Launcher();

diff --git a/source/gameengine/Launcher/LA_PlayerLauncher.cpp b/source/gameengine/Launcher/LA_PlayerLauncher.cpp
@@ -331,6 +331,11 @@ void LA_PlayerLauncher::ExitPython()
 #endif  // WITH_PYTHON
 }
 
+void LA_PlayerLauncher::SetWindowOrder(short order)
+{
+	m_mainWindow->setOrder((order == 0) ? GHOST_kWindowOrderBottom : GHOST_kWindowOrderTop);
+}
+
 void LA_PlayerLauncher::InitEngine()
 {
 	GPU_init();

diff --git a/source/gameengine/Launcher/LA_PlayerLauncher.h b/source/gameengine/Launcher/LA_PlayerLauncher.h
@@ -57,6 +57,8 @@ class LA_PlayerLauncher : public LA_Launcher
 	virtual void InitPython();
 	virtual void ExitPython();
 
+	virtual void SetWindowOrder(short order);
+
 public:
 	LA_PlayerLauncher(GHOST_ISystem* system, Main *maggie, Scene *scene, GlobalSettings *gs,
 					  RAS_IRasterizer::StereoMode stereoMode, int argc, char **argv, char *pythonMainLoop);