Attempt to fix #4526: Panel sizes not persisted between startups (Linux)

codereader · Jun 28, 2017 · fab4a32 · fab4a32
1 parent 8a69a67
commit fab4a32
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 17 deletions.
diff --git a/include/imainframelayout.h b/include/imainframelayout.h
@@ -38,6 +38,11 @@ class IMainFrameLayout
 	 * its state.
 	 */
 	virtual void toggleFullscreenCameraView() = 0;
+
+	/**
+	 * Loads and applies the stored state from the registry.
+	 */
+	virtual void restoreStateFromRegistry() = 0;
 };
 typedef std::shared_ptr<IMainFrameLayout> IMainFrameLayoutPtr;
 

diff --git a/radiant/ui/mainframe/EmbeddedLayout.cpp b/radiant/ui/mainframe/EmbeddedLayout.cpp
@@ -176,6 +176,11 @@ void EmbeddedLayout::restoreStateFromPath(const std::string& path)
     }
 }
 
+void EmbeddedLayout::restoreStateFromRegistry()
+{
+	restoreStateFromPath(RKEY_EMBEDDED_ROOT);
+}
+
 void EmbeddedLayout::saveStateToPath(const std::string& path)
 {
     GlobalRegistry().createKeyWithName(path, "pane", "horizontal");

diff --git a/radiant/ui/mainframe/EmbeddedLayout.h b/radiant/ui/mainframe/EmbeddedLayout.h
@@ -28,10 +28,11 @@ class EmbeddedLayout :
 
 public:
 	// IMainFrameLayout implementation
-	virtual std::string getName();
-	virtual void activate();
-	virtual void deactivate();
-	virtual void toggleFullscreenCameraView();
+	std::string getName() override;
+	void activate() override;
+	void deactivate() override;
+	void toggleFullscreenCameraView() override;
+	void restoreStateFromRegistry() override;
 
 	// The creation function, needed by the mainframe layout manager
 	static EmbeddedLayoutPtr CreateInstance();

diff --git a/radiant/ui/mainframe/FloatingLayout.cpp b/radiant/ui/mainframe/FloatingLayout.cpp
@@ -131,10 +131,15 @@ void FloatingLayout::toggleFullscreenCameraView()
 	_floatingCamWnd->ShowFullScreen(!_floatingCamWnd->IsFullScreen());
 }
 
+void FloatingLayout::restoreStateFromRegistry()
+{
+	// nothing yet
+}
+
 // The creation function, needed by the mainframe layout manager
 FloatingLayoutPtr FloatingLayout::CreateInstance()
 {
-	return FloatingLayoutPtr(new FloatingLayout);
+	return std::make_shared<FloatingLayout>();
 }
 
 } // namespace ui
diff --git a/radiant/ui/mainframe/FloatingLayout.h b/radiant/ui/mainframe/FloatingLayout.h
@@ -22,10 +22,11 @@ class FloatingLayout :
 
 public:
 	// IMainFrameLayout implementation
-	virtual std::string getName();
-	virtual void activate();
-	virtual void deactivate();
-	virtual void toggleFullscreenCameraView();
+	std::string getName() override;
+	void activate() override;
+	void deactivate() override;
+	void toggleFullscreenCameraView() override;
+	void restoreStateFromRegistry() override;
 
 	// The creation function, needed by the mainframe layout manager
 	static FloatingLayoutPtr CreateInstance();

diff --git a/radiant/ui/mainframe/MainFrame.cpp b/radiant/ui/mainframe/MainFrame.cpp
@@ -228,6 +228,22 @@ void MainFrame::construct()
 		}
 	}
 
+#ifdef __linux__
+	// #4526: In Linux, do another restore after the top level window has been shown
+	// After startup, GTK emits onSizeAllocate events which trigger a Layout() sequence
+	// messing up the pane positions, so do the restore() one more time after the main
+	// window came up.
+	_topLevelWindow->Bind(wxEVT_SHOW, [&](wxShowEvent& ev)
+	{
+		if (_currentLayout && ev.IsShown())
+		{
+			_currentLayout->restoreStateFromRegistry();
+		}
+
+		ev.Skip();
+	});
+#endif
+
 	// register the commands
 	GlobalMainFrameLayoutManager().registerCommands();
 

diff --git a/radiant/ui/mainframe/RegularLayout.cpp b/radiant/ui/mainframe/RegularLayout.cpp
@@ -175,6 +175,11 @@ void RegularLayout::restoreStateFromPath(const std::string& path)
 	}
 }
 
+void RegularLayout::restoreStateFromRegistry()
+{
+	restoreStateFromPath(RKEY_REGULAR_ROOT);
+}
+
 void RegularLayout::saveStateToPath(const std::string& path)
 {
 	GlobalRegistry().createKeyWithName(path, "pane", "horizontal");

diff --git a/radiant/ui/mainframe/RegularLayout.h b/radiant/ui/mainframe/RegularLayout.h
@@ -38,10 +38,11 @@ class RegularLayout :
 
 public:
 	// IMainFrameLayout implementation
-	virtual std::string getName();
-	virtual void activate();
-	virtual void deactivate();
-	virtual void toggleFullscreenCameraView();
+	std::string getName() override;
+	void activate() override;
+	void deactivate() override;
+	void toggleFullscreenCameraView() override;
+	void restoreStateFromRegistry() override;
 
 	// The creation function, needed by the mainframe layout manager
 	static RegularLayoutPtr CreateRegularLeftInstance();

diff --git a/radiant/ui/mainframe/SplitPaneLayout.cpp b/radiant/ui/mainframe/SplitPaneLayout.cpp
@@ -360,6 +360,11 @@ void SplitPaneLayout::toggleFullscreenCameraView()
 	}
 }
 
+void SplitPaneLayout::restoreStateFromRegistry()
+{
+	restoreStateFromPath(RKEY_SPLITPANE_ROOT);
+}
+
 SplitPaneLayout::Position SplitPaneLayout::getCameraPositionFromRegistry()
 {
 	int value = registry::getValue<int>(RKEY_SPLITPANE_CAMPOS);

diff --git a/radiant/ui/mainframe/SplitPaneLayout.h b/radiant/ui/mainframe/SplitPaneLayout.h
@@ -83,10 +83,11 @@ class SplitPaneLayout :
 
 public:
 	// IMainFrameLayout implementation
-	virtual std::string getName();
-	virtual void activate();
-	virtual void deactivate();
-	virtual void toggleFullscreenCameraView();
+	std::string getName() override;
+	void activate() override;
+	void deactivate() override;
+	void toggleFullscreenCameraView() override;
+	void restoreStateFromRegistry() override;
 
 	// The creation function, needed by the mainframe layout manager
 	static SplitPaneLayoutPtr CreateInstance();