Merge pull request #381 from Hpero4/master

bugfix: aram buff flyout seize active
Zzaphkiel · May 28, 2024 · 2bcab70 · 2bcab70
2 parents 354c013 + 7420857
commit 2bcab70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/components/profile_level_icon_widget.py b/app/components/profile_level_icon_widget.py
@@ -147,7 +147,6 @@ def enterEvent(self, a0):
                 self.mFlyout = AramFlyout(
                     info=self.aramInfo,
                     target=self,
-                    parent=None
                 )
                 self.mFlyout.show()
                 # TODO Animation -- By Hpero4
@@ -167,11 +166,10 @@ class AramFlyout(FlyoutViewBase):
     def __init__(self, info, target, parent=None):
         super().__init__(parent=parent)
 
-        self.setWindowFlags(Qt.FramelessWindowHint | Qt.Tool)
+        self.setWindowFlags(Qt.ToolTip | Qt.FramelessWindowHint |
+                            Qt.NoDropShadowWindowHint)
         self.setAttribute(Qt.WA_TranslucentBackground)
 
-        self.setWindowFlags(Qt.FramelessWindowHint)
-
         self.info = info
         self.target = target
 
@@ -225,7 +223,7 @@ def calcPoints(self):
         if x < 5:
             x = 5
 
-        if y < 5:
+        if y < 2:
             y = pos.y() + self.target.height() + 5
 
         return QPoint(x, y)

diff --git a/app/view/main_window.py b/app/view/main_window.py
@@ -861,6 +861,9 @@ async def __onGameStart(self):
 
         # 如果是进游戏后开的软件，需要先把友方信息更新上去
         async def paintAllySummonersInfo():
+            # TODO 自定义时, 若队伍成员<5, 会触发重新加载导致性能浪费
+            if self.gameInfoInterface.allyChampions and len(self.gameInfoInterface.allyChampions) >= 5:
+                return
             self.gameInfoInterface.allyChampions = {}
             self.gameInfoInterface.allyOrder = []