Remove the Floating layout

This layout is difficult to use, buggy (especially on Linux), unmaintained and obsolete now that the Dockable layout exists.
codereader · Oct 27, 2021 · 348ee40 · 348ee40
1 parent 287b3d2
commit 348ee40
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 193 deletions.
diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
@@ -93,7 +93,6 @@ add_executable(darkradiant
                ui/LongRunningOperationHandler.cpp
                ui/mainframe/AuiLayout.cpp
                ui/mainframe/EmbeddedLayout.cpp
-               ui/mainframe/FloatingLayout.cpp
                ui/mainframe/MainFrame.cpp
                ui/mainframe/MainFrameLayoutManager.cpp
                ui/mainframe/RegularLayout.cpp

diff --git a/radiant/ui/mainframe/FloatingLayout.cpp b/radiant/ui/mainframe/FloatingLayout.cpp
diff --git a/radiant/ui/mainframe/FloatingLayout.h b/radiant/ui/mainframe/FloatingLayout.h
diff --git a/radiant/ui/mainframe/MainFrameLayoutManager.cpp b/radiant/ui/mainframe/MainFrameLayoutManager.cpp
@@ -9,7 +9,6 @@
 #include "module/StaticModule.h"
 
 #include "AuiLayout.h"
-#include "FloatingLayout.h"
 #include "SplitPaneLayout.h"
 #include "RegularLayout.h"
 #include "EmbeddedLayout.h"
@@ -34,11 +33,9 @@ IMainFrameLayoutPtr MainFrameLayoutManager::getLayout(const std::string& name) {
 void MainFrameLayoutManager::registerLayout(
 	const std::string& name, const CreateMainFrameLayoutFunc& func)
 {
-	std::pair<LayoutMap::iterator, bool> result = _layouts.insert(
-		LayoutMap::value_type(name, func)
-	);
+    auto result = _layouts.insert({name, func});
 
-	// Check if the insertion was successful
+    // Check if the insertion was successful
 	if (!result.second) {
 		rError() << "MainFrameLayoutManager: Layout "
 			<< name << " already registered." << std::endl;
@@ -85,7 +82,6 @@ void MainFrameLayoutManager::initialiseModule(const IApplicationContext& ctx)
 	// Register the default layouts
 	registerLayout(EMBEDDED_LAYOUT_NAME, EmbeddedLayout::CreateInstance);
 	registerLayout(AUI_LAYOUT_NAME, AuiLayout::CreateInstance);
-	registerLayout(FLOATING_LAYOUT_NAME, FloatingLayout::CreateInstance);
 	registerLayout(SPLITPANE_LAYOUT_NAME, SplitPaneLayout::CreateInstance);
 	registerLayout(REGULAR_LAYOUT_NAME, RegularLayout::CreateRegularInstance);
 	registerLayout(REGULAR_LEFT_LAYOUT_NAME, RegularLayout::CreateRegularLeftInstance);