haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fixes https://gitlab.com/kicad/code/kicad/issues/5897
This commit is contained in:
Jeff Young 2020-10-28 23:06:48 +00:00
parent d26d93b32c
commit 5a644aa3fb
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
View File

@ -46,5 +46,6 @@ bool S3D::Configure3DPaths( wxWindow* aParent, FILENAME_RESOLVER* aResolver )
{ {
DIALOG_CONFIGURE_PATHS dlg( aParent, 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 );
} }

3
common/tool/common_control.cpp
View File

@ -97,7 +97,8 @@ int COMMON_CONTROL::ConfigurePaths( const TOOL_EVENT& aEvent )
{ {
DIALOG_CONFIGURE_PATHS dlg( m_frame, nullptr ); 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 ); m_frame->Kiway().CommonSettingsChanged( true, false );
} }

3
pcbnew/pcbnew.cpp
View File

@ -117,7 +117,8 @@ static struct IFACE : public KIFACE_I
// module. So set it directly. // module. So set it directly.
dlg.SetKiway( &dlg, aKiway ); 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 ); aKiway->CommonSettingsChanged( true, false );
// Dialog has completed; nothing to return. // Dialog has completed; nothing to return.