More stupid PyQt enums

This commit is contained in:
Kovid Goyal 2020-12-19 12:33:55 +05:30
parent 9a4cef4b5d
commit b30f58703b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 5 deletions

View File

@ -55,13 +55,13 @@ class TagDelegate(QStyledItemDelegate): # {{{
painter.fillRect(r, bg) painter.fillRect(r, bg)
style.proxy().drawPrimitive(style.PE_PanelItemViewItem, option, painter, widget) style.proxy().drawPrimitive(style.PE_PanelItemViewItem, option, painter, widget)
painter.setOpacity(0.3) painter.setOpacity(0.3)
icon.paint(painter, r, option.decorationAlignment, QIcon.Mode.Normal, QIcon.Mode.On) icon.paint(painter, r, option.decorationAlignment, QIcon.Mode.Normal, QIcon.State.On)
painter.restore() painter.restore()
def draw_icon(self, style, painter, option, widget): def draw_icon(self, style, painter, option, widget):
r = style.subElementRect(style.SE_ItemViewItemDecoration, option, widget) r = style.subElementRect(style.SE_ItemViewItemDecoration, option, widget)
icon = option.icon icon = option.icon
icon.paint(painter, r, option.decorationAlignment, QIcon.Mode.Normal, QIcon.Mode.On) icon.paint(painter, r, option.decorationAlignment, QIcon.Mode.Normal, QIcon.State.On)
def paint_text(self, painter, rect, flags, text, hover): def paint_text(self, painter, rect, flags, text, hover):
set_color = hover and QApplication.instance().is_dark_theme set_color = hover and QApplication.instance().is_dark_theme

View File

@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
from PyQt5.Qt import ( from PyQt5.Qt import (
QToolButton, QSize, QPropertyAnimation, Qt, QMetaObject, pyqtProperty, QSizePolicy, QToolButton, QSize, QPropertyAnimation, Qt, QMetaObject, pyqtProperty, QSizePolicy,
QWidget, QIcon, QPainter, QStyleOptionToolButton) QWidget, QIcon, QPainter, QStyleOptionToolButton, QStyle, QAbstractAnimation)
from calibre.gui2 import config from calibre.gui2 import config
@ -54,7 +54,7 @@ class ThrobbingButton(QToolButton):
def start_animation(self): def start_animation(self):
if config['disable_animations']: if config['disable_animations']:
return return
if self.animation.state() != self.animation.Stopped or not self.isVisible(): if self.animation.state() != QAbstractAnimation.State.Stopped or not self.isVisible():
return return
size = self.iconSize().width() size = self.iconSize().width()
smaller = int(0.7 * size) smaller = int(0.7 * size)
@ -73,7 +73,7 @@ class ThrobbingButton(QToolButton):
self.initStyleOption(opt) self.initStyleOption(opt)
s = self.style() s = self.style()
opt.iconSize = QSize(size, size) opt.iconSize = QSize(size, size)
s.drawComplexControl(s.CC_ToolButton, opt, p, self) s.drawComplexControl(QStyle.ComplexControl.CC_ToolButton, opt, p, self)
if __name__ == '__main__': if __name__ == '__main__':