Refactor floating tool management.

Author: solemnwarning

src/ToolDock.cpp

@@ -518,7 +518,6 @@ void REHex::ToolDock::OnMotion(wxMouseEvent &event)
 				if(dest_notebook->GetPageCount() == 1)
 				{
 					ResetNotebookSize(dest_notebook);
-					dest_notebook->Show();
 				}
 
 				if(frame != NULL)
@@ -550,45 +549,64 @@ void REHex::ToolDock::OnMotion(wxMouseEvent &event)
 				frame->SetPosition(frame_pos);
 				frame->Show();
 
-				ToolPanel *tool = m_left_down_tool;
+				frame->Bind(wxEVT_CLOSE_WINDOW, &REHex::ToolDock::OnFrameClose, this);
 
-				#if 0
-				frame->Bind(wxEVT_ICONIZE, [this, frame, tool](wxIconizeEvent &event)
+				m_tool_frames.emplace(m_left_down_tool, frame);
+			}
+		}
+	}
+	
+	event.Skip();
+}
+
+void REHex::ToolDock::OnFrameClose(wxCloseEvent &event)
+{
+	ToolFrame *frame = (ToolFrame*)(event.GetEventObject());
+	
+	ToolPanel *tool = frame->GetTool();
+	if(tool != NULL)
+	{
+		frame->RemoveTool(tool);
+		
+		ToolNotebook *dest_notebook = NULL;
+		
+		switch(tool->shape())
+		{
+			case ToolPanel::Shape::TPS_WIDE:
+				if(m_bottom_notebook->GetPageCount() > 0 || m_top_notebook->GetPageCount() == 0)
 				{
-					if(event.IsIconized())
-					{
-						tool->Reparent(m_right_notebook);
-						m_right_notebook->AddPage(tool, tool->name(), true);
-						
-						m_tool_frames.erase(tool);
-						frame->Destroy();
-					}
-				});
-				#endif
+					dest_notebook = m_bottom_notebook;
+				}
+				else{
+					dest_notebook = m_top_notebook;
+				}
+				
+				break;
 
-				frame->Bind(wxEVT_CLOSE_WINDOW, [this, frame, tool](wxCloseEvent &event)
+			case ToolPanel::Shape::TPS_TALL:
+				if(m_right_notebook->GetPageCount() > 0 || m_left_notebook->GetPageCount() == 0)
 				{
-					frame->GetSizer()->Detach(tool);
-					tool->Reparent(m_right_notebook);
-
-					m_right_notebook->AddPage(tool, tool->name(), true);
-
-					if(m_right_notebook->GetPageCount() == 1)
-					{
-						ResetNotebookSize(m_right_notebook);
-						m_right_notebook->Show();
-					}
-					
-					m_tool_frames.erase(tool);
-					frame->Destroy();
-				});
+					dest_notebook = m_right_notebook;
+				}
+				else{
+					dest_notebook = m_left_notebook;
+				}
 
-				m_tool_frames.emplace(m_left_down_tool, frame);
-			}
+				break;
+		}
+		
+		tool->Reparent(dest_notebook);
+		dest_notebook->AddPage(tool, tool->label(), true);
+		
+		if(dest_notebook->GetPageCount() == 1)
+		{
+			ResetNotebookSize(dest_notebook);
 		}
+		
+		m_tool_frames.erase(tool);
 	}
 
-	event.Skip();
+	frame->Destroy();
 }
 
 BEGIN_EVENT_TABLE(REHex::ToolDock::ToolNotebook, wxNotebook)
@@ -603,6 +621,11 @@ bool REHex::ToolDock::ToolNotebook::AddPage(wxWindow *page, const wxString &text
 	bool res = wxNotebook::AddPage(page, text, select, imageId);
 	UpdateToolVisibility();
 
+	if(GetPageCount() == 1)
+	{
+		Show();
+	}
+	
 	return res;
 }
 
@@ -611,6 +634,11 @@ bool REHex::ToolDock::ToolNotebook::DeletePage(size_t page)
 	bool res = wxNotebook::DeletePage(page);
 	UpdateToolVisibility();
 
+	if(GetPageCount() == 0)
+	{
+		Hide();
+	}
+	
 	return res;
 }
 
@@ -619,6 +647,11 @@ bool REHex::ToolDock::ToolNotebook::InsertPage(size_t index, wxWindow *page, con
 	bool res = wxNotebook::InsertPage(index, page, text, select, imageId);
 	UpdateToolVisibility();
 
+	if(GetPageCount() == 1)
+	{
+		Show();
+	}
+	
 	return res;
 }
 
@@ -627,6 +660,11 @@ bool REHex::ToolDock::ToolNotebook::RemovePage(size_t page)
 	bool res = wxNotebook::RemovePage(page);
 	UpdateToolVisibility();
 
+	if(GetPageCount() == 0)
+	{
+		Hide();
+	}
+	
 	return res;
 }
 
@@ -721,15 +759,44 @@ void REHex::ToolDock::ToolNotebook::OnPageChanged(wxNotebookEvent& event)
 }
 
 REHex::ToolDock::ToolFrame::ToolFrame(wxWindow *parent, ToolPanel *tool):
-	wxFrame(parent, wxID_ANY, tool->name(), wxDefaultPosition, wxDefaultSize,
-		(wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT))
+	wxFrame(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+		(wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT)),
+	m_tool(NULL)
 {
-	SetClientSize(tool->GetSize());
+	m_sizer = new wxBoxSizer(wxHORIZONTAL);
+	SetSizer(m_sizer);
+	
+	if(tool != NULL)
+	{
+		AdoptTool(tool);
+	}
+}
 
+void REHex::ToolDock::ToolFrame::AdoptTool(ToolPanel *tool)
+{
+	assert(m_tool == NULL);
+	
+	m_tool = tool;
+	
+	SetClientSize(tool->GetSize());
+	
 	tool->Reparent(this);
 	tool->Show();
+	
+	SetTitle(tool->label());
+	m_sizer->Add(tool, 1, wxEXPAND);
+}
+
+void REHex::ToolDock::ToolFrame::RemoveTool(ToolPanel *tool)
+{
+	assert(m_tool == tool);
+	
+	m_tool = NULL;
+	
+	m_sizer->Detach(tool);
+}
 
-	wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
-	sizer->Add(tool, 1, wxEXPAND);
-	SetSizer(sizer);
+REHex::ToolPanel *REHex::ToolDock::ToolFrame::GetTool() const
+{
+	return m_tool;
 }

src/ToolDock.hpp

@@ -23,6 +23,7 @@
 #include <wx/config.h>
 #include <wx/event.h>
 #include <wx/notebook.h>
+#include <wx/sizer.h>
 
 #include "MultiSplitter.hpp"
 #include "ToolPanel.hpp"
@@ -47,6 +48,9 @@ namespace REHex
 			void LoadTools(wxConfig *config, SharedDocumentPointer &document, DocumentCtrl *document_ctrl);
 
 		private:
+			/**
+			 * @brief wxNotebook specialisation for holding any tools docked to the main window.
+			*/
 			class ToolNotebook: public wxNotebook
 			{
 				public:
@@ -76,10 +80,30 @@ namespace REHex
 				DECLARE_EVENT_TABLE()
 			};
 
+			/**
+			 * @brief wxFrame specialisation for holding a detached/floating tool.
+			*/
 			class ToolFrame: public wxFrame
 			{
 				public:
-					ToolFrame(wxWindow *parent, ToolPanel *tool);
+					ToolFrame(wxWindow *parent, ToolPanel *tool = NULL);
+					
+					void AdoptTool(ToolPanel *tool);
+					
+					/**
+					 * @brief Remove the owned tool.
+					 *
+					 * This method must be called to detach the tool from the
+					 * floating frame before it can be re-inserted elsewhere in
+					 * the window heierarchy.
+					*/
+					void RemoveTool(ToolPanel *tool);
+					
+					ToolPanel *GetTool() const;
+					
+				private:
+					wxBoxSizer *m_sizer;
+					ToolPanel *m_tool;
 			};
 
 			wxWindow *m_main_panel;
@@ -117,6 +141,7 @@ namespace REHex
 			void OnLeftUp(wxMouseEvent &event);
 			void OnMouseCaptureLost(wxMouseCaptureLostEvent &event);
 			void OnMotion(wxMouseEvent &event);
+			void OnFrameClose(wxCloseEvent &event);
 
 		DECLARE_EVENT_TABLE()
 	};