vcl/inc/printdlg.hxx | 6 +++++ vcl/source/window/printdlg.cxx | 48 +++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 14 deletions(-)
New commits: commit 9540c1fc15caebd58671e300a529dbfd6d2ab13d Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Oct 5 11:09:20 2020 +0200 Commit: Aron Budea <[email protected]> CommitDate: Mon Oct 11 00:38:41 2021 +0200 Use idle to update preview in print dlg Otherwise UI blocks while the preview is being updated Change-Id: I98c536b83a31e9ea3f72effc8a602ee190a81e68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103951 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index c313e8fc4856..64e127e43261 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -22,6 +22,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/idle.hxx> #include <vcl/print.hxx> #include <vcl/customweld.hxx> #include <vcl/weld.hxx> @@ -223,6 +224,11 @@ namespace vcl Paper mePaper; + Idle maUpdatePreviewIdle; + DECL_LINK(updatePreviewIdle, Timer*, void); + Idle maUpdatePreviewNoCacheIdle; + DECL_LINK(updatePreviewNoCacheIdle, Timer*, void); + DECL_LINK( ClickHdl, weld::Button&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void ); DECL_LINK( ActivateHdl, weld::Entry&, bool ); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 7640da4fcd22..120d6a5b6e1c 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -578,6 +578,8 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC , mbCollateAlwaysOff(false) , mbShowLayoutFrame( true ) , mbSingleJobs( false ) + , maUpdatePreviewIdle("Print Dialog Update Preview Idle") + , maUpdatePreviewNoCacheIdle("Print Dialog Update Preview (no cache) Idle") { // save printbutton text, gets exchanged occasionally with print to file maPrintText = mxOKButton->get_label(); @@ -648,6 +650,11 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC maNupLandscapeSize = Size( aNupSize.Height(), aNupSize.Width() ); } + maUpdatePreviewIdle.SetPriority(TaskPriority::POST_PAINT); + maUpdatePreviewIdle.SetInvokeHandler(LINK( this, PrintDialog, updatePreviewIdle)); + maUpdatePreviewNoCacheIdle.SetPriority(TaskPriority::POST_PAINT); + maUpdatePreviewNoCacheIdle.SetInvokeHandler(LINK(this, PrintDialog, updatePreviewNoCacheIdle)); + initFromMultiPageSetup( maPController->getMultipage() ); // setup optional UI options set by application @@ -901,6 +908,16 @@ void PrintDialog::setPreviewText() mxNumPagesText->set_label( aNewText ); } +IMPL_LINK_NOARG(PrintDialog, updatePreviewIdle, Timer*, void) +{ + preparePreview(true); +} + +IMPL_LINK_NOARG(PrintDialog, updatePreviewNoCacheIdle, Timer*, void) +{ + preparePreview(false); +} + void PrintDialog::preparePreview( bool i_bMayUseCache ) { VclPtr<Printer> aPrt( maPController->getPrinter() ); @@ -1144,7 +1161,10 @@ void PrintDialog::updateNup( bool i_bMayUseCache ) mxNupOrder->setValues( aMPS.nOrder, nCols, nRows ); - preparePreview( i_bMayUseCache ); + if (i_bMayUseCache) + maUpdatePreviewIdle.Start(); + else + maUpdatePreviewNoCacheIdle.Start(); } void PrintDialog::updateNupFromPages( bool i_bMayUseCache ) @@ -1800,7 +1820,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void) } else if ( &rButton == mxPreviewBox.get() ) { - preparePreview( true ); + maUpdatePreviewIdle.Start(); } else if( &rButton == mxForwardBtn.get() ) { @@ -1829,7 +1849,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void) checkOptionalControlDependencies(); // update preview and page settings - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } if( mxBrochureBtn->get_active() ) { @@ -1860,7 +1880,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void) maPController->setReversePrint( bChecked ); maPController->setValue( "PrintReverse", makeAny( bChecked ) ); - preparePreview( true ); + maUpdatePreviewIdle.Start(); } else if( &rButton == mxBorderCB.get() ) { @@ -1900,7 +1920,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void) setupPaperSidesBox(); // tdf#63905 don't use cache: page size may change - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } checkControlDependencies(); } @@ -1924,7 +1944,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, void ) mxOKButton->set_label(maPrintText); updatePrinterText(); setPaperSizes(); - preparePreview(true); + maUpdatePreviewIdle.Start(); } else // print to file { @@ -1935,7 +1955,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, void ) setPaperSizes(); updateOrientationBox(); - preparePreview( true ); + maUpdatePreviewIdle.Start(); } setupPaperSidesBox(); @@ -1979,7 +1999,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, void ) checkPaperSize( aPaperSize ); maPController->setPaperSizeFromUser( aPaperSize ); - preparePreview(true); + maUpdatePreviewIdle.Start(); } } @@ -2011,7 +2031,7 @@ IMPL_LINK_NOARG(PrintDialog, ActivateHdl, weld::Entry&, bool) if (nNewCurPage != mnCurPage) { mnCurPage = nNewCurPage; - preparePreview(true); + maUpdatePreviewIdle.Start(); } return true; } @@ -2045,7 +2065,7 @@ IMPL_LINK( PrintDialog, UIOption_CheckHdl, weld::ToggleButton&, i_rBox, void ) checkOptionalControlDependencies(); // update preview and page settings - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } } @@ -2074,7 +2094,7 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, weld::ToggleButton&, i_rBtn, void ) mxPageRangeEdit->grab_focus(); // update preview and page settings - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } } } @@ -2100,7 +2120,7 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, weld::ComboBox&, i_rBox, void ) checkOptionalControlDependencies(); // update preview and page settings - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } } @@ -2117,7 +2137,7 @@ IMPL_LINK( PrintDialog, UIOption_SpinModifyHdl, weld::SpinButton&, i_rBox, void checkOptionalControlDependencies(); // update preview and page settings - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } } @@ -2134,7 +2154,7 @@ IMPL_LINK( PrintDialog, UIOption_EntryModifyHdl, weld::Entry&, i_rBox, void ) checkOptionalControlDependencies(); // update preview and page settings - preparePreview(false); + maUpdatePreviewNoCacheIdle.Start(); } }
