[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kolourpaint/frameworks] mainWindow: Fix centered printout in landscape mode
From:       Martin Koller <kollix () aon ! at>
Date:       2016-04-30 15:18:26
Message-ID: E1awWf4-0002Fc-7m () scm ! kde ! org
[Download RAW message or body]

Git commit 3a48dd18fa60649956d894803b50a8e12e89b103 by Martin Koller.
Committed on 30/04/2016 at 15:06.
Pushed by mkoller into branch 'frameworks'.

Fix centered printout in landscape mode

BUG: 362359

M  +8    -16   mainWindow/kpMainWindow_File.cpp

http://commits.kde.org/kolourpaint/3a48dd18fa60649956d894803b50a8e12e89b103

diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp
index 599fb6a..c13266d 100644
--- a/mainWindow/kpMainWindow_File.cpp
+++ b/mainWindow/kpMainWindow_File.cpp
@@ -1346,29 +1346,21 @@ void kpMainWindow::sendImageToPrinter (QPrinter *printer,
     }
 
 
+    // Send image to printer.
+    QPainter painter;
+    painter.begin(printer);
+
     double originX = 0, originY = 0;
 
     // Center image on page?
     if (d->configPrintImageCenteredOnPage)
     {
-        originX =
-            (printerWidthMM * dpiX / KP_MILLIMETERS_PER_INCH - image.width ())
-                / 2;
-        originY =
-            (printerHeightMM * dpiY / KP_MILLIMETERS_PER_INCH - image.height ())
-                / 2;
+        originX = (printer->width() - image.width ()) / 2;
+        originY = (printer->height() - image.height ()) / 2;
     }
 
-#if DEBUG_KP_MAIN_WINDOW
-    kDebug () << "\torigin: x=" << originX << " y=" << originY;
-#endif
-
-
-    // Send image to printer.
-    QPainter painter;
-    painter.begin (printer);
-    painter.drawImage (qRound (originX), qRound (originY), image);
-    painter.end ();
+    painter.drawImage(qRound(originX), qRound(originY), image);
+    painter.end();
 }
 
 //---------------------------------------------------------------------
[prev in list] [next in list] [prev in thread] [next in thread]