#5623: Show the dialog when the menu item is selected, instead of tog…

…gling it
codereader · May 31, 2021 · a0c15c3 · a0c15c3
1 parent 899ac8f
commit a0c15c3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -364,7 +364,7 @@ void UserInterfaceModule::registerUICommands()
 	GlobalCommandSystem().addCommand("ToggleLightInspector", LightInspector::toggleInspector);
 	GlobalCommandSystem().addCommand("SurfaceInspector", SurfaceInspector::toggle);
 	GlobalCommandSystem().addCommand("PatchInspector", PatchInspector::toggle);
-	GlobalCommandSystem().addCommand("MergeControlDialog", MergeControlDialog::Toggle);
+	GlobalCommandSystem().addCommand("MergeControlDialog", MergeControlDialog::ShowDialog);
 	GlobalCommandSystem().addCommand("OverlayDialog", OverlayDialog::toggle);
 	GlobalCommandSystem().addCommand("TransformDialog", TransformDialog::toggle);
 

diff --git a/radiant/ui/merge/MergeControlDialog.cpp b/radiant/ui/merge/MergeControlDialog.cpp
@@ -102,9 +102,9 @@ void MergeControlDialog::onMainFrameShuttingDown()
     InstancePtr().reset();
 }
 
-void MergeControlDialog::Toggle(const cmd::ArgumentList& args)
+void MergeControlDialog::ShowDialog(const cmd::ArgumentList& args)
 {
-    Instance().ToggleVisibility();
+    Instance().Show();
 }
 
 void MergeControlDialog::convertTextCtrlToPathEntry(const std::string& ctrlName)
@@ -245,11 +245,6 @@ void MergeControlDialog::_preShow()
     updateControlSensitivity();
 }
 
-void MergeControlDialog::rescanSelection()
-{
-
-}
-
 void MergeControlDialog::selectionChanged(const scene::INodePtr& node, bool isComponent)
 {
     if (node->getNodeType() != scene::INode::Type::MergeAction)
@@ -270,7 +265,6 @@ void MergeControlDialog::onIdle(wxIdleEvent& ev)
     if (!_updateNeeded) return;
 
     _updateNeeded = false;
-    rescanSelection();
     updateControlSensitivity();
 }
 

diff --git a/radiant/ui/merge/MergeControlDialog.h b/radiant/ui/merge/MergeControlDialog.h
@@ -30,7 +30,7 @@ class MergeControlDialog :
     static MergeControlDialog& Instance();
 
     // The command target
-    static void Toggle(const cmd::ArgumentList& args);
+    static void ShowDialog(const cmd::ArgumentList& args);
 
     /** greebo: SelectionSystem::Observer implementation. Gets called by
      * the SelectionSystem upon selection change to allow updating of the
@@ -53,7 +53,6 @@ class MergeControlDialog :
     void onAbortMerge(wxCommandEvent& ev);
     void onRejectSelection(wxCommandEvent& ev);
     void updateControlSensitivity();
-    void rescanSelection();
     void queueUpdate();
     void onIdle(wxIdleEvent& ev);
     void onMapEvent(IMap::MapEvent ev);