--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Wed Sep 25 18:37:35 2019 +0200 +++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Wed Sep 25 18:48:22 2019 +0200 @@ -37,8 +37,8 @@ """ super(GreaseMonkeyConfigurationListDelegate, self).__init__(parent) - self.__removePixmap = \ - UI.PixmapCache.getIcon("greaseMonkeyTrash.png").pixmap( + self.__removePixmap = UI.PixmapCache.getIcon( + "greaseMonkeyTrash.png").pixmap( GreaseMonkeyConfigurationListDelegate.RemoveIconSize) self.__rowHeight = 0 self.__padding = 0 @@ -76,19 +76,25 @@ if Globals.isWindowsPlatform(): colorRole = QPalette.Text else: - colorRole = QPalette.HighlightedText \ + colorRole = ( + QPalette.HighlightedText if opt.state & QStyle.State_Selected else QPalette.Text + ) leftPos = self.__padding - rightPos = opt.rect.right() - self.__padding - \ + rightPos = ( + opt.rect.right() - self.__padding - GreaseMonkeyConfigurationListDelegate.RemoveIconSize + ) # Draw background style.drawPrimitive(QStyle.PE_PanelItemViewItem, opt, painter, widget) # Draw checkbox - checkBoxYPos = center - \ + checkBoxYPos = ( + center - GreaseMonkeyConfigurationListDelegate.CheckBoxSize // 2 + ) opt2 = QStyleOptionViewItem(opt) if opt2.checkState == Qt.Checked: opt2.state |= QStyle.State_On @@ -146,8 +152,10 @@ opt.palette, True, info, colorRole) # Draw remove button - removeIconYPos = center - \ + removeIconYPos = ( + center - GreaseMonkeyConfigurationListDelegate.RemoveIconSize // 2 + ) removeIconRect = QRect( rightPos, removeIconYPos, GreaseMonkeyConfigurationListDelegate.RemoveIconSize, @@ -167,24 +175,30 @@ self.initStyleOption(opt, index) widget = opt.widget - style = widget.style() if widget is not None \ + style = ( + widget.style() if widget is not None else QApplication.style() + ) padding = style.pixelMetric(QStyle.PM_FocusFrameHMargin) + 1 titleFont = opt.font titleFont.setBold(True) titleFont.setPointSize(titleFont.pointSize() + 1) - self.__padding = padding \ - if padding > GreaseMonkeyConfigurationListDelegate.MinPadding \ + self.__padding = ( + padding + if padding > GreaseMonkeyConfigurationListDelegate.MinPadding else GreaseMonkeyConfigurationListDelegate.MinPadding + ) titleMetrics = QFontMetrics(titleFont) - self.__rowHeight = 2 * self.__padding + \ - opt.fontMetrics.leading() + \ - opt.fontMetrics.height() + \ + self.__rowHeight = ( + 2 * self.__padding + + opt.fontMetrics.leading() + + opt.fontMetrics.height() + titleMetrics.height() + ) return QSize(GreaseMonkeyConfigurationListDelegate.ItemWidth, self.__rowHeight)