#5662: Show the merge dialog once the map switches to merge mode

codereader · Jul 18, 2021 · 5dacca8 · 5dacca8
1 parent 190209d
commit 5dacca8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -1,10 +1,13 @@
 #include "UserInterfaceModule.h"
 
+#include <sigc++/functors/ptr_fun.h>
+
 #include "i18n.h"
 #include "ilayer.h"
 #include "ifilter.h"
 #include "ientity.h"
 #include "imru.h"
+#include "imap.h"
 #include "ibrush.h"
 #include "ipatch.h"
 #include "iorthocontextmenu.h"
@@ -100,7 +103,8 @@ const StringSet& UserInterfaceModule::getDependencies() const
         MODULE_RADIANT_CORE,
         MODULE_MRU_MANAGER,
         MODULE_MAINFRAME,
-        MODULE_MOUSETOOLMANAGER
+        MODULE_MOUSETOOLMANAGER,
+        MODULE_MAP
     };
 
 	return _dependencies;
@@ -218,6 +222,10 @@ void UserInterfaceModule::initialiseModule(const IApplicationContext& ctx)
 	MouseToolRegistrationHelper::RegisterTools();
 
 	wxTheApp->Bind(DISPATCH_EVENT, &UserInterfaceModule::onDispatchEvent, this);
+
+    _mapEditModeChangedConn = GlobalMapModule().signal_editModeChanged().connect(
+        sigc::ptr_fun(&MergeControlDialog::OnMapEditModeChanged)
+    );
 }
 
 void UserInterfaceModule::shutdownModule()
@@ -230,6 +238,7 @@ void UserInterfaceModule::shutdownModule()
 
 	_coloursUpdatedConn.disconnect();
 	_entitySettingsConn.disconnect();
+    _mapEditModeChangedConn.disconnect();
 
 	_longOperationHandler.reset();
 	_mapFileProgressHandler.reset();

diff --git a/radiant/ui/UserInterfaceModule.h b/radiant/ui/UserInterfaceModule.h
@@ -51,6 +51,7 @@ class UserInterfaceModule :
 
 	sigc::connection _entitySettingsConn;
 	sigc::connection _coloursUpdatedConn;
+    sigc::connection _mapEditModeChangedConn;
 
 	std::size_t _execFailedListener;
 	std::size_t _textureChangedListener;

diff --git a/radiant/ui/merge/MergeControlDialog.cpp b/radiant/ui/merge/MergeControlDialog.cpp
@@ -421,7 +421,6 @@ void MergeControlDialog::_preHide()
     _undoHandler.disconnect();
     _redoHandler.disconnect();
     _mapEventHandler.disconnect();
-    _mapEditModeHandler.disconnect();
 
     GlobalSelectionSystem().removeObserver(this);
 }
@@ -439,10 +438,7 @@ void MergeControlDialog::_preShow()
     _mapEventHandler = GlobalMapModule().signal_mapEvent().connect(
         sigc::mem_fun(this, &MergeControlDialog::onMapEvent)
     );
-    _mapEditModeHandler = GlobalMapModule().signal_editModeChanged().connect(
-        sigc::mem_fun(this, &MergeControlDialog::onMapEditModeChanged)
-    );
-
+
     _undoHandler = GlobalUndoSystem().signal_postUndo().connect(
         sigc::mem_fun(this, &MergeControlDialog::queueUpdate));
     _redoHandler = GlobalUndoSystem().signal_postRedo().connect(
@@ -490,9 +486,19 @@ void MergeControlDialog::onMapEvent(IMap::MapEvent ev)
     }
 }
 
-void MergeControlDialog::onMapEditModeChanged(IMap::EditMode newMode)
+void MergeControlDialog::OnMapEditModeChanged(IMap::EditMode mode)
 {
-    update();
+    // When switching to merge mode, make sure the dialog is shown
+
+    if (!InstancePtr() && mode == IMap::EditMode::Merge)
+    {
+        Instance().Show();
+        return;
+    }
+    else if (InstancePtr() && Instance().IsShown())
+    { 
+        Instance().update();
+    }
 }
 
 void MergeControlDialog::updateSummary()

diff --git a/radiant/ui/merge/MergeControlDialog.h b/radiant/ui/merge/MergeControlDialog.h
@@ -21,7 +21,6 @@ class MergeControlDialog final :
     sigc::connection _undoHandler;
     sigc::connection _redoHandler;
     sigc::connection _mapEventHandler;
-    sigc::connection _mapEditModeHandler;
 
     bool _updateNeeded;
     std::size_t _numUnresolvedConflicts;
@@ -45,6 +44,8 @@ class MergeControlDialog final :
     bool isInThreeWayMergeMode();
     void setThreeWayMergeMode(bool enabled);
 
+    static void OnMapEditModeChanged(IMap::EditMode newMode);
+
 protected:
     void _preShow() override;
     void _preHide() override;
@@ -67,7 +68,6 @@ class MergeControlDialog final :
     void queueUpdate();
     void onIdle(wxIdleEvent& ev);
     void onMapEvent(IMap::MapEvent ev);
-    void onMapEditModeChanged(IMap::EditMode newMode);
     void updateSummary();
 
     void update();