QuasiModal needs to be used for any dialog hosting a help window.

Fixes https://gitlab.com/kicad/code/kicad/issues/5897
KiCad · Oct 28, 2020 · 5a644aa · 5a644aa
1 parent d26d93b
commit 5a644aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
@@ -46,5 +46,6 @@ bool S3D::Configure3DPaths( wxWindow* aParent, FILENAME_RESOLVER* aResolver )
 {
     DIALOG_CONFIGURE_PATHS dlg( aParent, aResolver );
 
-    return( dlg.ShowModal() == wxID_OK );
+    // Use QuasiModal so that HTML help window will work
+    return( dlg.ShowQuasiModal() == wxID_OK );
 }
diff --git a/common/tool/common_control.cpp b/common/tool/common_control.cpp
@@ -97,7 +97,8 @@ int COMMON_CONTROL::ConfigurePaths( const TOOL_EVENT& aEvent )
     {
         DIALOG_CONFIGURE_PATHS dlg( m_frame, nullptr );
 
-        if( dlg.ShowModal() == wxID_OK )
+        // Use QuasiModal so that HTML help window will work
+        if( dlg.ShowQuasiModal() == wxID_OK )
             m_frame->Kiway().CommonSettingsChanged( true, false );
     }
 

diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
@@ -117,7 +117,8 @@ static struct IFACE : public KIFACE_I
             // module.  So set it directly.
             dlg.SetKiway( &dlg, aKiway );
 
-            if( dlg.ShowModal() == wxID_OK )
+            // Use QuasiModal so that HTML help window will work
+            if( dlg.ShowQuasiModal() == wxID_OK )
                 aKiway->CommonSettingsChanged( true, false );
 
             // Dialog has completed; nothing to return.