Merge pull request #999 from amconners/develop

Fix for #992 and #998
This commit is contained in:
Tobias Frisch 2022-01-16 23:13:06 +01:00 committed by GitHub
commit 0182a43b8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -488,7 +488,7 @@ class corkDelegate(QStyledItemDelegate):
fullSummary = item.data(Outline.summaryFull)
if lineSummary or not fullSummary:
m = self.margin
r = self.mainLineRect.adjusted(-m, -m, m, m / 2)
r = self.mainLineRect.adjusted(-m, -m, m, int(m / 2))
p.save()
p.setPen(Qt.NoPen)
p.setBrush(QColor("#EEE"))

View file

@ -369,7 +369,7 @@ class textEditView(QTextEdit):
opt = settings.textEditor
docHeight = self.document().size().height() + 2 * opt["marginsTB"]
if self.heightMin <= docHeight <= self.heightMax:
self.setMinimumHeight(docHeight)
self.setMinimumHeight(int(docHeight))
def setAutoResize(self, val):
self._autoResize = val