# Origin: https://github.com/gottcode/focuswriter/commit/e7311fb017782a0bbf017d0055f6f01b36233b89

# Subject: FIXED: Possible delay on start when creating non-native printer.

# Origin: https://github.com/gottcode/focuswriter/commit/1423754c4eae874857ce34613bddead8224ee887

# Subject: FIXED: Memory leak from creating multiple printers.

--- src/stack.cpp.orig	2016-10-13 09:37:59 UTC

+++ src/stack.cpp

@@ -55,6 +55,7 @@

 Stack::Stack(QWidget* parent) :

 	QWidget(parent),

 	m_symbols_dialog(0),

+	m_printer(0),

 	m_current_document(0),

 	m_footer_margin(0),

 	m_header_margin(0),

@@ -78,17 +79,6 @@ Stack::Stack(QWidget* parent) :

 	m_find_dialog = new FindDialog(this);

 	connect(m_find_dialog, SIGNAL(findNextAvailable(bool)), this, SIGNAL(findNextAvailable(bool)));

-	m_printer = new QPrinter(QPrinter::HighResolution);

-#if (QT_VERSION >= QT_VERSION_CHECK(5,3,0))

-	m_printer->setPageSize(QPageSize(QPageSize::Letter));

-	m_printer->setPageOrientation(QPageLayout::Portrait);

-	m_printer->setPageMargins(QMarginsF(1.0, 1.0, 1.0, 1.0), QPageLayout::Inch);

-#else

-	m_printer->setPageSize(QPrinter::Letter);

-	m_printer->setOrientation(QPrinter::Portrait);

-	m_printer->setPageMargins(1.0, 1.0, 1.0, 1.0, QPrinter::Inch);

-#endif

-

 	connect(ActionManager::instance(), SIGNAL(insertText(QString)), this, SLOT(insertSymbol(QString)));

 	m_layout = new QGridLayout(this);

@@ -397,6 +387,7 @@ void Stack::pasteUnformatted()

 void Stack::pageSetup()

 {

+	initPrinter();

 	QPageSetupDialog dialog(m_printer, this);

 	dialog.exec();

 }

@@ -405,6 +396,7 @@ void Stack::pageSetup()

 void Stack::print()

 {

+	initPrinter();

 	m_current_document->print(m_printer);

 }

@@ -835,3 +827,23 @@ void Stack::updateMenuIndexes()

 }

 //-----------------------------------------------------------------------------

+

+void Stack::initPrinter()

+{

+	if (m_printer) {

+		return;

+	}

+

+	m_printer = new QPrinter(QPrinter::HighResolution);

+#if (QT_VERSION >= QT_VERSION_CHECK(5,3,0))

+	m_printer->setPageSize(QPageSize(QPageSize::Letter));

+	m_printer->setPageOrientation(QPageLayout::Portrait);

+	m_printer->setPageMargins(QMarginsF(1.0, 1.0, 1.0, 1.0), QPageLayout::Inch);

+#else

+	m_printer->setPageSize(QPrinter::Letter);

+	m_printer->setOrientation(QPrinter::Portrait);

+	m_printer->setPageMargins(1.0, 1.0, 1.0, 1.0, QPrinter::Inch);

+#endif

+}

+

+//-----------------------------------------------------------------------------

--- src/stack.h.orig	2016-10-13 09:37:59 UTC

+++ src/stack.h

@@ -140,6 +140,7 @@ private:

 #if (QT_VERSION < QT_VERSION_CHECK(5,6,0))

 	qreal devicePixelRatioF() const { return devicePixelRatio(); }

 #endif

+	void initPrinter();

 private:

 	AlertLayer* m_alerts;