Skip to content

Commit

Permalink
Merge pull request #158 from ChinaIceF/reconst
Browse files Browse the repository at this point in the history
fix: show tooltip when slider is clicked
  • Loading branch information
ChinaIceF authored Oct 22, 2024
2 parents ded75b7 + c29dab8 commit 0ee48bd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 5 additions & 0 deletions siui/components/slider/slider.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def mousePressEvent(self, event):
# 根据鼠标位置计算对应的 value
value = self._slider_position_from_mouse(mouse_pos)
self.setValue(value)
self.handle.enterEvent(event) # 显示工具提示
super().mousePressEvent(event)

def mouseMoveEvent(self, event):
Expand All @@ -106,6 +107,10 @@ def mouseMoveEvent(self, event):
self.setValue(value)
super().mouseMoveEvent(event)

def leaveEvent(self, a0):
super().leaveEvent(a0)
self.handle.leaveEvent(a0) # 保证工具提示消失

def _slider_position_from_mouse(self, mouse_pos: QPoint) -> int:
"""
根据鼠标位置计算滑块的值。
Expand Down
4 changes: 0 additions & 4 deletions siui/components/tooltip/tooltip.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ def flash(self):
def _refresh_position(self):
pos = QCursor.pos()
x, y = pos.x(), pos.y()
# self.move(x, y)
self.moveTo(x + 4, y - self.height()) # 动画跟踪,效果更佳,有了锚点直接输入鼠标坐标即可

def resizeEvent(self, event):
Expand All @@ -147,9 +146,6 @@ def resizeEvent(self, event):
# self.text_label.move(0, h - self.text_label.height()) 2024.9.23 - 存在快速滑动鼠标时文字错位的情况
self.text_label.move(0, h - self.height() + 16)

def enterEvent(self, event):
super().enterEvent(event)

def leaveEvent(self, event):
super().leaveEvent(event)
event.ignore()
2 changes: 1 addition & 1 deletion siui/components/widgets/expands.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QWidget

from siui.components import SiLabel, SiWidget, SiIconLabel, SiDenseHContainer, SiSvgLabel
from siui.components import SiDenseHContainer, SiIconLabel, SiLabel, SiSvgLabel, SiWidget
from siui.core import SiColor, SiExpAccelerateAnimation, SiGlobal


Expand Down

0 comments on commit 0ee48bd

Please sign in to comment.