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

PCM: progress dialog stay should on top, disable other windows

This commit is contained in:
qu1ck 2023-01-25 11:46:23 -08:00 committed by Jon Evans
parent ec9e7eed90
commit 7ec2989d30
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kicad/pcm/dialogs/dialog_pcm_progress.cpp
View File

@ -31,6 +31,7 @@ DIALOG_PCM_PROGRESS::DIALOG_PCM_PROGRESS( wxWindow* parent, bool aShowDownloadSe
m_downloadTotal( 0 ), m_downloadTotal( 0 ),
m_currentProgress( 0 ), m_currentProgress( 0 ),
m_currentProgressTotal( 0 ), m_currentProgressTotal( 0 ),
m_disabler( this ),
m_finished( false ) m_finished( false )
#if wxCHECK_VERSION( 3, 1, 0 ) #if wxCHECK_VERSION( 3, 1, 0 )
, ,

1
kicad/pcm/dialogs/dialog_pcm_progress.h
View File

@ -82,6 +82,7 @@ private:
#if wxCHECK_VERSION( 3, 1, 0 ) #if wxCHECK_VERSION( 3, 1, 0 )
wxAppProgressIndicator m_appProgressIndicator; wxAppProgressIndicator m_appProgressIndicator;
#endif #endif
wxWindowDisabler m_disabler;
}; };
#endif // DIALOG_PCM_PROGRESS_H_ #endif // DIALOG_PCM_PROGRESS_H_

4
kicad/pcm/pcm_task_manager.cpp
View File

@ -429,6 +429,8 @@ void PCM_TASK_MANAGER::InstallFromFile( wxWindow* aParent, const wxString& aFile
m_reporter->Destroy(); m_reporter->Destroy();
m_reporter.reset(); m_reporter.reset();
aParent->Raise();
m_color_themes_changed.store( package.type == PCM_PACKAGE_TYPE::PT_COLORTHEME ); m_color_themes_changed.store( package.type == PCM_PACKAGE_TYPE::PT_COLORTHEME );
} }
@ -643,6 +645,8 @@ void PCM_TASK_MANAGER::RunQueue( wxWindow* aParent )
m_reporter->Destroy(); m_reporter->Destroy();
m_reporter.reset(); m_reporter.reset();
aParent->Raise();
download_thread.join(); download_thread.join();
install_thread.join(); install_thread.join();
} }