eric7/WebBrowser/WebBrowserTabWidget.py

branch
eric7
changeset 8518
6a3eadfc3fb6
parent 8358
144a6b854f70
child 8556
766e1566cb74
--- a/eric7/WebBrowser/WebBrowserTabWidget.py	Thu Aug 19 17:21:03 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserTabWidget.py	Thu Aug 19 18:36:06 2021 +0200
@@ -9,8 +9,10 @@
 
 import os
 
-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice
-from PyQt6.QtGui import QIcon, QPixmap, QPainter
+from PyQt6.QtCore import (
+    pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice, QMarginsF
+)
+from PyQt6.QtGui import QIcon, QPixmap, QPainter, QPageLayout
 from PyQt6.QtWidgets import (
     QWidget, QHBoxLayout, QMenu, QToolButton, QDialog
 )
@@ -652,12 +654,12 @@
             printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
-        printer.setPageMargins(
+        printer.setPageMargins(QMarginsF(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
-            Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Unit.Millimeter
+            Preferences.getPrinter("BottomMargin") * 10),
+            QPageLayout.Unit.Millimeter
         )
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:
@@ -780,12 +782,12 @@
             printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
         else:
             printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
-        printer.setPageMargins(
+        printer.setPageMargins(QMarginsF(
             Preferences.getPrinter("LeftMargin") * 10,
             Preferences.getPrinter("TopMargin") * 10,
             Preferences.getPrinter("RightMargin") * 10,
-            Preferences.getPrinter("BottomMargin") * 10,
-            QPrinter.Unit.Millimeter
+            Preferences.getPrinter("BottomMargin") * 10),
+            QPageLayout.Unit.Millimeter
         )
         printerName = Preferences.getPrinter("PrinterName")
         if printerName:

eric ide

mercurial