Closing Ligth/Particle and Script editors now properly resets the com editors state

Author: FriskTheFallenHuman

neo/tools/imgui/lighteditor/LightEditor.cpp

@@ -564,7 +564,7 @@ static float* vecToArr( idVec3& v )
 
 void LightEditor::Draw()
 {
-	bool showTool = isShown;
+	showTool = isShown;
 	if( ImGui::Begin( title, &showTool ) ) //, ImGuiWindowFlags_ShowBorders ) )
 	{
 		bool changes = false;
@@ -781,9 +781,20 @@ void LightEditor::Draw()
 	if( isShown && !showTool )
 	{
 		isShown = showTool;
-		impl::SetReleaseToolMouse( false );
-		D3::ImGuiHooks::CloseWindow( D3::ImGuiHooks::D3_ImGuiWin_LightEditor );
+		Exit();
 	}
 }
 
+void LightEditor::Exit( void )
+{
+	// close this tool, release mouse, clear editor flags and reset edit mode
+	showTool = false;
+	LightEditor::Instance().ShowIt( false );
+	impl::SetReleaseToolMouse( false );
+	D3::ImGuiHooks::CloseWindow( D3::ImGuiHooks::D3_ImGuiWin_LightEditor );
+	// clear editor flag and reset edit mode cvar
+	com_editors &= ~EDITOR_LIGHT;
+	cvarSystem->SetCVarInteger( "g_editEntityMode", 0 );
+}
+
 } //namespace ImGuiTools

neo/tools/imgui/lighteditor/LightEditor.h

@@ -84,6 +84,7 @@ class LightInfo
 class LightEditor
 {
 private:
+	bool				showTool;
 	bool				isShown;
 
 	idStr				title;
@@ -110,6 +111,7 @@ class LightEditor
 #endif
 
 	void				Init( const idDict* dict, idEntity* light );
+	void				Exit( void );
 	void				Reset();
 
 	void				LoadLightTextures();

neo/tools/imgui/particleeditor/ParticleEditor.cpp

@@ -78,10 +78,8 @@ ParticleEditor::ParticleEditor()
 void ParticleEditor::Draw()
 {
 	int i, num;
-	bool showTool;
-	bool clickedNew = false, clickedSelect = false;
-
 	showTool = isShown;
+	bool clickedNew = false, clickedSelect = false;
 
 	if ( ImGui::Begin( "Particle Editor", &showTool, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_MenuBar ) ) {
 		impl::SetReleaseToolMouse( true );
@@ -105,9 +103,11 @@ void ParticleEditor::Draw()
 					OnBnClickedButtonSave();
 				}
 
-				if( ImGui::MenuItem( "Close", "Ctrl+W" ) )
+				ImGui::Separator();
+
+				if ( ImGui::MenuItem( "Exit" ) )
 				{
-					showTool = false;
+					Exit();
 				}
 
 				ImGui::EndMenu();
@@ -706,11 +706,22 @@ void ParticleEditor::Draw()
 	if ( isShown && !showTool )
 	{
 		isShown = showTool;
-		impl::SetReleaseToolMouse( false );
-		D3::ImGuiHooks::CloseWindow( D3::ImGuiHooks::D3_ImGuiWin_ParticleEditor );
+		Exit();
 	}
 }
 
+void ParticleEditor::Exit( void )
+{
+	// close this tool, release mouse, clear editor flags and reset edit mode
+	showTool = false;
+	ParticleEditor::Instance().ShowIt( false );
+	impl::SetReleaseToolMouse( false );
+	D3::ImGuiHooks::CloseWindow( D3::ImGuiHooks::D3_ImGuiWin_ParticleEditor );
+	// clear editor flag and reset edit mode cvar
+	com_editors &= ~EDITOR_PARTICLE;
+	cvarSystem->SetCVarInteger( "g_editEntityMode", 0 );
+}
+
 // ParticleEditor message handlers
 
 void ParticleEditor::OnBnClickedParticleMode() {

neo/tools/imgui/particleeditor/ParticleEditor.h

@@ -121,6 +121,8 @@ class ParticleEditor {
 	void					Reset();
 	void					Draw();
 
+	void					Exit( void );
+
 	void			ShowIt(bool show) {
 		isShown = show;
 	}
@@ -152,6 +154,7 @@ class ParticleEditor {
 	void		OnBtnZdn();
 
 private:
+	bool				showTool;
 	bool				isShown;
 
 	DeclNewSelect		particleNewDlg;

neo/tools/imgui/scripteditor/ScriptEditor.cpp

@@ -77,10 +77,8 @@ void ScriptEditor::Reset() {
 
 void ScriptEditor::Draw()
 {
-	bool showTool;
-	bool clickedNew = false, clickedSelect = false;
-
 	showTool = isShown;
+	bool clickedNew = false, clickedSelect = false;
 
 	if ( ImGui::Begin( windowText.c_str(), &showTool, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_MenuBar ) ) {
 		impl::SetReleaseToolMouse(true);
@@ -104,9 +102,9 @@ void ScriptEditor::Draw()
 					OnBnClickedOk();
 				}
 
-				if (ImGui::MenuItem("Close", "Ctrl+W"))
+				if (ImGui::MenuItem("Exit"))
 				{
-					showTool = false;
+					Exit();
 				}
 
 				ImGui::EndMenu();
@@ -146,11 +144,26 @@ void ScriptEditor::Draw()
 	if ( isShown && !showTool )
 	{
 		isShown = showTool;
-		impl::SetReleaseToolMouse( false );
-		D3::ImGuiHooks::CloseWindow( D3::ImGuiHooks::D3_ImGuiWin_ScriptEditor );
+		Exit();
 	}
 }
 
+/*
+================
+ScriptEditor::Exit
+================
+*/
+void ScriptEditor::Exit( void )
+{
+	// close this tool, release mouse, clear editor flags and reset edit mode
+	showTool = false;
+	ScriptEditor::Instance().ShowIt( false );
+	impl::SetReleaseToolMouse( false );
+	D3::ImGuiHooks::CloseWindow( D3::ImGuiHooks::D3_ImGuiWin_ScriptEditor );
+	// clear editor flag
+	com_editors &= ~EDITOR_SCRIPT;
+}
+
 /*
 ================
 ScriptEditor::UpdateStatusBar

neo/tools/imgui/scripteditor/ScriptEditor.h

@@ -45,6 +45,7 @@ class ScriptEditor {
 
 	void					Reset();
 	void					Draw();
+	void					Exit( void );
 
 	void					ShowIt(bool show) {
 		isShown = show;
@@ -58,6 +59,7 @@ class ScriptEditor {
 	void					OnBnClickedCancel();
 
 private:
+	bool					showTool;
 	bool					isShown;
 	idStr					windowText;
 	idStr					errorText;