修复 长按抽取数量控制，触屏适配长按快速增减数量功能

Author: lzy98276

CHANGELOG/v1.3.2-alpha.5/CHANGELOG.md

@@ -25,7 +25,8 @@ v2.0 - Koharu（小鸟游星野） Alpha 5
 - 修复 **浮窗周期性置顶**，解决功能未生效的问题
 - 修复 **重复模式剩余人数**，解决直接显示结果时剩余人数不更新的问题
 - 修复 **名单设置界面逻辑**，解决 **班级名称和奖池名称同时为空** 及 **未设置班级仍可点击其他按钮** 的问题
-- 修复 **结果显示触屏问题**，新增解决点击结果后无法正常滑动滚动结果的修复
+- 修复 **结果显示触屏问题**，解决点击结果后无法正常滑动滚动结果的修复
+- 修复 **长按抽取数量控制**，触屏适配长按快速增减数量功能
 
 ## 🔧 其它变更
 

app/view/main/lottery.py

@@ -114,10 +114,56 @@ def initUI(self):
         self.reset_button.setFixedHeight(45)
         self.reset_button.clicked.connect(lambda: self.reset_count())
 
+        # 自定义的鼠标事件处理方法，将右键事件转换为左键事件
+        def custom_mouse_press_event(widget, event):
+            if event.button() == Qt.MouseButton.RightButton:
+                # 将右键按下事件转换为左键按下事件
+                new_event = QMouseEvent(
+                    QEvent.Type.MouseButtonPress,
+                    event.position(),
+                    Qt.MouseButton.LeftButton,
+                    Qt.MouseButton.LeftButton,
+                    Qt.KeyboardModifier.NoModifier,
+                )
+                QApplication.sendEvent(widget, new_event)
+            else:
+                # 其他事件正常处理
+                PushButton.mousePressEvent(widget, event)
+
+        def custom_mouse_release_event(widget, event):
+            if event.button() == Qt.MouseButton.RightButton:
+                # 将右键释放事件转换为左键释放事件
+                new_event = QMouseEvent(
+                    QEvent.Type.MouseButtonRelease,
+                    event.position(),
+                    Qt.MouseButton.LeftButton,
+                    Qt.MouseButton.NoButton,
+                    Qt.KeyboardModifier.NoModifier,
+                )
+                QApplication.sendEvent(widget, new_event)
+            else:
+                # 其他事件正常处理
+                PushButton.mouseReleaseEvent(widget, event)
+
         self.minus_button = PushButton("-")
         self._set_widget_font(self.minus_button, 20)
         self.minus_button.setFixedSize(45, 45)
         self.minus_button.clicked.connect(lambda: self.update_count(-1))
+        # 禁用右键菜单，兼容触屏
+        self.minus_button.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)
+
+        # 动态替换按钮的鼠标事件处理方法
+        original_minus_press = self.minus_button.mousePressEvent
+        original_minus_release = self.minus_button.mouseReleaseEvent
+
+        def minus_press_wrapper(event):
+            custom_mouse_press_event(self.minus_button, event)
+
+        def minus_release_wrapper(event):
+            custom_mouse_release_event(self.minus_button, event)
+
+        self.minus_button.mousePressEvent = minus_press_wrapper
+        self.minus_button.mouseReleaseEvent = minus_release_wrapper
 
         # 添加长按连续减功能
         self.minus_button.pressed.connect(lambda: self.start_long_press(-1))
@@ -133,6 +179,21 @@ def initUI(self):
         self._set_widget_font(self.plus_button, 20)
         self.plus_button.setFixedSize(45, 45)
         self.plus_button.clicked.connect(lambda: self.update_count(1))
+        # 禁用右键菜单，兼容触屏
+        self.plus_button.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)
+
+        # 动态替换按钮的鼠标事件处理方法
+        original_plus_press = self.plus_button.mousePressEvent
+        original_plus_release = self.plus_button.mouseReleaseEvent
+
+        def plus_press_wrapper(event):
+            custom_mouse_press_event(self.plus_button, event)
+
+        def plus_release_wrapper(event):
+            custom_mouse_release_event(self.plus_button, event)
+
+        self.plus_button.mousePressEvent = plus_press_wrapper
+        self.plus_button.mouseReleaseEvent = plus_release_wrapper
 
         # 添加长按连续加功能
         self.plus_button.pressed.connect(lambda: self.start_long_press(1))
@@ -1165,6 +1226,15 @@ def clearLayout(self, layout):
             if child.widget():
                 child.widget().setParent(None)
 
+    def eventFilter(self, obj, event):
+        """事件过滤器，处理触屏长按事件"""
+        if obj in (self.minus_button, self.plus_button):
+            if event.type() == QEvent.Type.MouseButtonPress:
+                # 处理左/右键点击，确保长按功能正常
+                return super().eventFilter(obj, event)
+            # 其他事件正常处理
+        return super().eventFilter(obj, event)
+
     def _set_widget_font(self, widget, font_size):
         """为控件设置字体"""
         # 确保字体大小有效

app/view/main/roll_call.py

@@ -114,10 +114,56 @@ def initUI(self):
         self.reset_button.setFixedHeight(45)
         self.reset_button.clicked.connect(lambda: self.reset_count())
 
+        # 自定义的鼠标事件处理方法，将右键事件转换为左键事件
+        def custom_mouse_press_event(widget, event):
+            if event.button() == Qt.MouseButton.RightButton:
+                # 将右键按下事件转换为左键按下事件
+                new_event = QMouseEvent(
+                    QEvent.Type.MouseButtonPress,
+                    event.position(),
+                    Qt.MouseButton.LeftButton,
+                    Qt.MouseButton.LeftButton,
+                    Qt.KeyboardModifier.NoModifier,
+                )
+                QApplication.sendEvent(widget, new_event)
+            else:
+                # 其他事件正常处理
+                PushButton.mousePressEvent(widget, event)
+
+        def custom_mouse_release_event(widget, event):
+            if event.button() == Qt.MouseButton.RightButton:
+                # 将右键释放事件转换为左键释放事件
+                new_event = QMouseEvent(
+                    QEvent.Type.MouseButtonRelease,
+                    event.position(),
+                    Qt.MouseButton.LeftButton,
+                    Qt.MouseButton.NoButton,
+                    Qt.KeyboardModifier.NoModifier,
+                )
+                QApplication.sendEvent(widget, new_event)
+            else:
+                # 其他事件正常处理
+                PushButton.mouseReleaseEvent(widget, event)
+
         self.minus_button = PushButton("-")
         self._set_widget_font(self.minus_button, 20)
         self.minus_button.setFixedSize(45, 45)
         self.minus_button.clicked.connect(lambda: self.update_count(-1))
+        # 禁用右键菜单，兼容触屏
+        self.minus_button.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)
+
+        # 动态替换按钮的鼠标事件处理方法
+        original_minus_press = self.minus_button.mousePressEvent
+        original_minus_release = self.minus_button.mouseReleaseEvent
+
+        def minus_press_wrapper(event):
+            custom_mouse_press_event(self.minus_button, event)
+
+        def minus_release_wrapper(event):
+            custom_mouse_release_event(self.minus_button, event)
+
+        self.minus_button.mousePressEvent = minus_press_wrapper
+        self.minus_button.mouseReleaseEvent = minus_release_wrapper
 
         # 添加长按连续减功能
         self.minus_button.pressed.connect(lambda: self.start_long_press(-1))
@@ -133,6 +179,21 @@ def initUI(self):
         self._set_widget_font(self.plus_button, 20)
         self.plus_button.setFixedSize(45, 45)
         self.plus_button.clicked.connect(lambda: self.update_count(1))
+        # 禁用右键菜单，兼容触屏
+        self.plus_button.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)
+
+        # 动态替换按钮的鼠标事件处理方法
+        original_plus_press = self.plus_button.mousePressEvent
+        original_plus_release = self.plus_button.mouseReleaseEvent
+
+        def plus_press_wrapper(event):
+            custom_mouse_press_event(self.plus_button, event)
+
+        def plus_release_wrapper(event):
+            custom_mouse_release_event(self.plus_button, event)
+
+        self.plus_button.mousePressEvent = plus_press_wrapper
+        self.plus_button.mouseReleaseEvent = plus_release_wrapper
 
         # 添加长按连续加功能
         self.plus_button.pressed.connect(lambda: self.start_long_press(1))
@@ -1112,6 +1173,15 @@ def clearLayout(self, layout):
             if child.widget():
                 child.widget().setParent(None)
 
+    def eventFilter(self, obj, event):
+        """事件过滤器，处理触屏长按事件"""
+        if obj in (self.minus_button, self.plus_button):
+            if event.type() == QEvent.Type.MouseButtonPress:
+                # 处理左/右键点击，确保长按功能正常
+                return super().eventFilter(obj, event)
+            # 其他事件正常处理
+        return super().eventFilter(obj, event)
+
     def _set_widget_font(self, widget, font_size):
         """为控件设置字体"""
         # 确保字体大小有效