Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix double text draw and centering in centered button

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-04 10:56:42 +05:30
parent 260a59b17f
commit a475b97cef
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/widgets2.py
View File

@ -174,7 +174,7 @@ class CenteredToolButton(RightClickButton):
opt = QStyleOptionToolButton()
self.initStyleOption(opt)
text = opt.text
opt.text = text
opt.text = ''
opt.icon = QIcon()
s = painter.style()
painter.drawComplexControl(QStyle.ComplexControl.CC_ToolButton, opt)
@ -184,10 +184,11 @@ class CenteredToolButton(RightClickButton):
flags = self.text_flags | Qt.TextFlag.TextHideMnemonic
fw = s.pixelMetric(QStyle.PixelMetric.PM_DefaultFrameWidth, opt, self)
opt.rect.adjust(fw, fw, -fw, -fw)
painter.drawItemText(opt.rect, flags, opt.palette, self.isEnabled(), text)
fm = QFontMetrics(opt.font)
text_rect = s.itemTextRect(fm, opt.rect, flags, self.isEnabled(), text)
w = opt.iconSize.width()
text_rect = opt.rect.adjusted(w, 0, 0, 0)
painter.drawItemText(text_rect, flags, opt.palette, self.isEnabled(), text)
fm = QFontMetrics(opt.font)
text_rect = s.itemTextRect(fm, text_rect, flags, self.isEnabled(), text)
left = text_rect.left() - w - 4
pixmap_rect = QRect(left, opt.rect.top(), opt.iconSize.width(), opt.rect.height())
painter.drawItemPixmap(pixmap_rect, Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter, self.icon().pixmap(opt.iconSize))