修复 Flyout 在 mac 下无法使用中文输入法的问题

Author: zhiyiYo

qfluentwidgets/components/widgets/flyout.py

@@ -1,9 +1,10 @@
 # coding:utf-8
 from enum import Enum
+import sys
 from typing import Union
 
 from PyQt5.QtCore import (Qt, QPropertyAnimation, QPoint, QParallelAnimationGroup, QEasingCurve, QMargins,
-                          QRectF, QObject, QSize, pyqtSignal)
+                          QRectF, QObject, QSize, pyqtSignal, QEvent)
 from PyQt5.QtGui import QPixmap, QPainter, QColor, QCursor, QIcon, QImage, QPainterPath, QBrush, QMovie, QImageReader
 from PyQt5.QtWidgets import QWidget, QGraphicsDropShadowEffect, QLabel, QHBoxLayout, QVBoxLayout, QApplication
 
@@ -207,20 +208,34 @@ class Flyout(QWidget):
 
     closed = pyqtSignal()
 
-    def __init__(self, view: FlyoutViewBase, parent=None, isDeleteOnClose=True):
+    def __init__(self, view: FlyoutViewBase, parent=None, isDeleteOnClose=True, isMacInputMethodEnabled=False):
         super().__init__(parent=parent)
         self.view = view
         self.hBoxLayout = QHBoxLayout(self)
         self.aniManager = None  # type: FlyoutAnimationManager
         self.isDeleteOnClose = isDeleteOnClose
+        self.isMacInputMethodEnabled = isMacInputMethodEnabled
 
         self.hBoxLayout.setContentsMargins(15, 8, 15, 20)
         self.hBoxLayout.addWidget(self.view)
         self.setShadowEffect()
 
         self.setAttribute(Qt.WA_TranslucentBackground)
-        self.setWindowFlags(Qt.Popup | Qt.FramelessWindowHint |
-                            Qt.NoDropShadowWindowHint)
+
+        if sys.platform != "darwin" or not isMacInputMethodEnabled:
+            self.setWindowFlags(Qt.Popup | Qt.FramelessWindowHint |
+                                Qt.NoDropShadowWindowHint)
+        else:
+            self.setWindowFlags(Qt.Dialog | Qt.FramelessWindowHint | Qt.NoDropShadowWindowHint)
+            QApplication.instance().installEventFilter(self)
+
+    def eventFilter(self, watched, event):
+        if sys.platform == "darwin" and self.isMacInputMethodEnabled:
+            if self.isVisible() and event.type() == QEvent.MouseButtonPress:
+                if not self.rect().contains(self.mapFromGlobal(event.globalPos())):
+                    self.close()
+
+        return super().eventFilter(watched, event)
 
     def setShadowEffect(self, blurRadius=35, offset=(0, 8)):
         """ add shadow to dialog """
@@ -252,7 +267,7 @@ def exec(self, pos: QPoint, aniType=FlyoutAnimationType.PULL_UP):
 
     @classmethod
     def make(cls, view: FlyoutViewBase, target: Union[QWidget, QPoint] = None, parent=None,
-             aniType=FlyoutAnimationType.PULL_UP, isDeleteOnClose=True):
+             aniType=FlyoutAnimationType.PULL_UP, isDeleteOnClose=True, isMacInputMethodEnabled=False):
         """ create and show a flyout
 
         Parameters
@@ -272,7 +287,7 @@ def make(cls, view: FlyoutViewBase, target: Union[QWidget, QPoint] = None, paren
         isDeleteOnClose: bool
             whether delete flyout automatically when flyout is closed
         """
-        w = cls(view, parent, isDeleteOnClose)
+        w = cls(view, parent, isDeleteOnClose, isMacInputMethodEnabled)
 
         if target is None:
             return w
@@ -290,7 +305,7 @@ def make(cls, view: FlyoutViewBase, target: Union[QWidget, QPoint] = None, paren
     @classmethod
     def create(cls, title: str, content: str, icon: Union[FluentIconBase, QIcon, str] = None,
                image: Union[str, QPixmap, QImage] = None, isClosable=False, target: Union[QWidget, QPoint] = None,
-               parent=None, aniType=FlyoutAnimationType.PULL_UP, isDeleteOnClose=True):
+               parent=None, aniType=FlyoutAnimationType.PULL_UP, isDeleteOnClose=True, isMacInputMethodEnabled=False):
         """ create and show a flyout using the default view
 
         Parameters
@@ -323,7 +338,7 @@ def create(cls, title: str, content: str, icon: Union[FluentIconBase, QIcon, str
             whether delete flyout automatically when flyout is closed
         """
         view = FlyoutView(title, content, icon, image, isClosable)
-        w = cls.make(view, target, parent, aniType, isDeleteOnClose)
+        w = cls.make(view, target, parent, aniType, isDeleteOnClose, isMacInputMethodEnabled)
         view.closed.connect(w.close)
         return w