From 73cd53e7e089537aa853eea7d43f212145bd5ef5 Mon Sep 17 00:00:00 2001 From: Wilbert Berendsen Date: Mon, 8 Nov 2021 09:30:39 +0100 Subject: [PATCH] fix implicit conversion float->int, not supported anymore in Python 3.10 --- frescobaldi_app/widgets/linenumberarea.py | 4 ++-- frescobaldi_app/widgets/progressbar.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py index f097726c4..ff38bcc6f 100644 --- a/frescobaldi_app/widgets/linenumberarea.py +++ b/frescobaldi_app/widgets/linenumberarea.py @@ -21,7 +21,7 @@ A line number area to be used in a QPlainTextEdit. """ -from PyQt5.QtCore import QEvent, QPoint, QRect, QSize, Qt +from PyQt5.QtCore import QEvent, QPoint, QRectF, QSize, Qt from PyQt5.QtGui import QFontMetrics, QMouseEvent, QPainter from PyQt5.QtWidgets import QApplication, QWidget @@ -72,7 +72,7 @@ def paintEvent(self, ev): return painter = QPainter(self) painter.setFont(edit.font()) - rect = QRect(0, 0, self.width() - 2, QFontMetrics(edit.font()).height()) + rect = QRectF(0, 0, self.width() - 2, QFontMetrics(edit.font()).height()) block = edit.firstVisibleBlock() while block.isValid(): geom = edit.blockBoundingGeometry(block) diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py index 670bf0f5b..183ab6257 100644 --- a/frescobaldi_app/widgets/progressbar.py +++ b/frescobaldi_app/widgets/progressbar.py @@ -71,8 +71,8 @@ def start(self, total, elapsed=0.0): """ self._hideTimer.stop() self._timeline.stop() - self._timeline.setDuration(total * 1000) - self._timeline.setCurrentTime(elapsed * 1000) + self._timeline.setDuration(int(total * 1000)) + self._timeline.setCurrentTime(int(elapsed * 1000)) self.setValue(self._timeline.currentFrame()) self._timeline.resume() if self._hideWhileIdle and not self._hidden: