Merge branch 'master' of https://github.com/PyQt5/PyQt

Author: 892768447

Demo/NewFramelessWindow.py

@@ -9,6 +9,8 @@
 @description:
 """
 
+import sys
+
 try:
     from PyQt5.QtCore import QEvent, QObject, QPoint, Qt, QTimer
     from PyQt5.QtGui import QColor, QMouseEvent, QPainter, QWindow
@@ -148,6 +150,18 @@ def __init__(self, *args, **kwargs):
         self.buttonClose.clicked.connect(self.close)
         self.setStyleSheet('#widgetTitleBar{background: rgb(232, 232, 232);}')
 
+    def showMinimized(self):
+        flags = self.windowFlags()
+        if sys.platform == 'darwin':
+            # fix mac 最小化失效问题
+            self.setWindowFlags((self.windowFlags() | Qt.CustomizeWindowHint) &
+                                (~Qt.WindowTitleHint))
+        super(FramelessWindow, self).showMinimized()
+        if sys.platform == 'darwin':
+            # fix mac 最小化失效问题
+            self.setWindowFlags(flags)
+            self.show()
+
     def changeEvent(self, event):
         """窗口状态改变
         :param event:

QComboBox/CenterText.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Created on 2022/09/03
+@author: Irony
+@site: https://pyqt.site https://github.com/PyQt5
+@email: [email protected]
+@file: CenterText.py
+@description: 文字居中对齐
+"""
+
+import sys
+
+try:
+    from PyQt5.QtCore import Qt
+    from PyQt5.QtWidgets import QApplication, QStyle, QVBoxLayout, QWidget
+except ImportError:
+    from PySide2.QtCore import Qt
+    from PySide2.QtWidgets import QApplication, QStyle, QVBoxLayout, QWidget
+
+from Lib.CtComboBox import CtComboBox
+
+
+class Window(QWidget):
+
+    def __init__(self, *args, **kwargs):
+        super(Window, self).__init__(*args, **kwargs)
+        layout = QVBoxLayout(self)
+
+        c1 = CtComboBox(self)
+        c1.addItems(['item-%s' % i for i in range(10)])
+        layout.addWidget(c1)
+
+        # 可编辑
+        c2 = CtComboBox(self)
+        c2.setEditable(True)
+        c2.lineEdit().setAlignment(Qt.AlignCenter)
+        c2.addItems(['item-%s' % i for i in range(10)])
+        layout.addWidget(c2)
+
+        # 带图标
+        c3 = CtComboBox(self)
+        for i in range(10):
+            c3.addItem(c3.style().standardIcon(QStyle.SP_ComputerIcon),
+                       'item-%s' % i)
+        layout.addWidget(c3)
+
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    w = Window()
+    w.show()
+    sys.exit(app.exec_())

QComboBox/Lib/CtComboBox.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Created on 2022/09/04
+@author: Irony
+@site: https://pyqt.site https://github.com/PyQt5
+@email: [email protected]
+@file: CtComboBox.py
+@description: 文字居中对齐
+"""
+
+try:
+    from PyQt5.QtCore import QRect, Qt
+    from PyQt5.QtGui import QIcon, QPalette
+    from PyQt5.QtWidgets import QComboBox, QProxyStyle
+except ImportError:
+    from PySide2.QtCore import QRect, Qt
+    from PySide2.QtGui import QIcon, QPalette
+    from PySide2.QtWidgets import QComboBox, QProxyStyle
+
+
+class ComboBoxStyle(QProxyStyle):
+
+    def drawControl(self, element, option, painter, widget=None):
+        if element == QProxyStyle.CE_ComboBoxLabel:
+            # https://github.com/qt/qtbase/blob/5.15.2/src/widgets/styles/qcommonstyle.cpp#L2200
+            editRect = self.subControlRect(QProxyStyle.CC_ComboBox, option,
+                                           QProxyStyle.SC_ComboBoxEditField,
+                                           widget)
+            painter.save()
+            painter.setClipRect(editRect)
+            if not option.currentIcon.isNull():
+                # 绘制图标
+                mode = QIcon.Normal if (
+                    option.state &
+                    QProxyStyle.State_Enabled) else QIcon.Disabled
+                pixmap = option.currentIcon.pixmap(
+                    widget.window().windowHandle() if widget else None,
+                    option.iconSize, mode)
+                iconRect = QRect(editRect)
+                iconRect.setWidth(option.iconSize.width() + 4)
+                iconRect = self.alignedRect(option.direction,
+                                            Qt.AlignLeft | Qt.AlignVCenter,
+                                            iconRect.size(), editRect)
+                if option.editable:
+                    painter.fillRect(iconRect,
+                                     option.palette.brush(QPalette.Base))
+                self.drawItemPixmap(painter, iconRect, Qt.AlignCenter, pixmap)
+
+                if option.direction == Qt.RightToLeft:
+                    editRect.translate(-4 - option.iconSize.width(), 0)
+                else:
+                    editRect.translate(option.iconSize.width() + 4, 0)
+            if option.currentText and not option.editable:
+                # 考虑右边箭头位置
+                arrowRect = self.subControlRect(QProxyStyle.CC_ComboBox, option,
+                                                QProxyStyle.SC_ComboBoxArrow,
+                                                widget)
+                editRect.setWidth(editRect.width() + arrowRect.width())
+                # 绘制居中文字
+                self.drawItemText(
+                    painter, editRect.adjusted(1, 0, -1, 0),
+                    self.visualAlignment(option.direction, Qt.AlignCenter),
+                    option.palette, option.state & QProxyStyle.State_Enabled,
+                    option.currentText)
+            painter.restore()
+            return
+        super(ComboBoxStyle, self).drawControl(element, option, painter, widget)
+
+
+class CtComboBox(QComboBox):
+
+    def __init__(self, *args, **kwargs):
+        super(CtComboBox, self).__init__(*args, **kwargs)
+        # 绑定每个元素添加信号，用于设置文本居中
+        self.model().rowsInserted.connect(self._onRowsInserted)
+        self.setStyle(ComboBoxStyle())
+
+    def _onRowsInserted(self, index, first, last):
+        if first < 0:
+            return
+        for i in range(first, last + 1):
+            self.view().model().item(i).setTextAlignment(Qt.AlignCenter)

QComboBox/Lib/__init__.py

@@ -2,8 +2,10 @@
 
 - 目录
   - [下拉数据关联](#1下拉数据关联)
+  - [文本居中显示](#2文本居中显示)
 
 ## 1、下拉数据关联
+
 [运行 CityLinkage.py](CityLinkage.py)
 
 一个省市区关联的三级联动，数据源在data.json中
@@ -12,4 +14,13 @@
 2. 并根据唯一编码过滤，为了不影响内容显示，唯一编码的角色为`ToolTipRole`
 3. 用`QColumnView`可以实现类似效果
 
-![CityLinkage](ScreenShot/CityLinkage.gif)
+![CityLinkage](ScreenShot/CityLinkage.gif)
+
+## 2、文本居中显示
+
+[运行 CenterText.py](CenterText.py)
+
+1. 使用`QProxyStyle`对文件居中显示
+2. 新增得item数据使用`setTextAlignment`对齐
+
+![CenterText](ScreenShot/CenterText.png)

QComboBox/README.md

@@ -0,0 +1,93 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Created on 2022年12月12日
+@site: https://pyqt.site , https://github.com/PyQt5
+@description: QPainter画图
+"""
+import sys
+try:
+    from PyQt5.QtWidgets import QApplication, QWidget, qApp
+    from PyQt5.QtGui import QPainter, QFont, QColor, QPixmap
+    from PyQt5.QtCore import Qt, pyqtSignal
+    from PyQt5.Qt import QPoint, QPolygon
+except ImportError:
+    from PySide2.QtWidgets import QApplication, QWidget, qApp
+    from PySide2.QtGui import QPainter, QFont, QColor, QPixmap
+    from PySide2.QtCore import Qt, pyqtSignal
+    from PySide2.Qt import QPoint, QPolygon
+
+
+
+class draw(QWidget):
+
+
+    drawsig = pyqtSignal(bool)
+
+    def __init__(self):
+        super(draw, self).__init__()
+        self.setWindowTitle("QPainter画图")
+        self._painter = QPainter()
+        self.scale = 1.0
+        self.pixmap = QPixmap()
+        self.setMouseTracking(True)
+        self.setFocusPolicy(Qt.WheelFocus)
+        self.drawEnable = False
+        self.points = []
+        self.current_points = []
+        self.drawsig.connect(self.setDrawEnable)
+
+
+    def setDrawEnable(self, enable=False):
+        self.drawEnable = enable
+        self.update()
+
+    def mouseMoveEvent(self, ev):
+        if self.drawEnable:
+            def in_end_range(curr, first):
+                return first.x() - 5 <= curr.x() <= first.x() + 5 and first.y() - 5 <= curr.y() <= first.y() + 5
+
+            if len(self.current_points) > 0 and in_end_range(ev.pos(), self.current_points[0]):
+                self.current_points.append(self.current_points[0])
+                self.points.append(self.current_points)
+                self.current_points = []
+            else:
+                self.current_points.append(ev.pos())
+        elif len(self.current_points) > 0:
+            self.current_points.append(ev.pos())
+            self.points.append(self.current_points)
+            self.current_points = []
+
+        self.update()
+
+    def mousePressEvent(self, ev):
+        if Qt.LeftButton & ev.button():
+            self.drawsig.emit(True)
+    def mouseReleaseEvent(self, ev):
+        if Qt.LeftButton & ev.button():
+            self.drawsig.emit(False)
+
+    def paintEvent(self, ev):
+        if len(self.points) <= 0 and len(self.current_points) <= 0 :  return
+        p = self._painter
+        p.begin(self)
+        p.setRenderHint(QPainter.Antialiasing)
+        p.setRenderHint(QPainter.HighQualityAntialiasing)
+        p.setRenderHint(QPainter.SmoothPixmapTransform)
+        p.scale(self.scale, self.scale)
+        p.setPen(QColor(0, 0, 0))
+        for pts in self.points:
+            p.drawPolyline(QPolygon(pts))
+        if len(self.current_points) > 0:
+            p.drawPolyline(QPolygon(self.current_points))
+        p.end()
+
+
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    mainWin = draw()
+    mainWin.show()
+    sys.exit(app.exec_())
+

QComboBox/ScreenShot/CenterText.png

@@ -1 +1,16 @@
-# QPainter
+# QPainter
+
+
+- 目录
+  - [利用QPainter绘制各种图形](#QPainter绘制各种图形)
+  - [简易画板](#简易画板)
+  
+## 1、QPainter绘制各种图形
+[运行 StockDialog.py](StockDialog.py)
+
+![CountDownClose](ScreenShot/StockDialog.gif)
+
+## 2、简易画板
+[运行 Draw.py](Draw.py)
+
+![CustomColorIcon](ScreenShot/Draw.gif)