mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge remote-tracking branch 'PKEv/correct_screenshot_tooltip'
This commit is contained in:
commit
c7b5337723
|
@ -29,7 +29,7 @@ ToolBoxGraphicsItem::ToolBoxGraphicsItem()
|
|||
this->opacityAnimation->setKeyValueAt(1, this->activeOpacity);
|
||||
this->opacityAnimation->setDuration(this->fadeTimeMs);
|
||||
|
||||
setOpacity(this->idleOpacity);
|
||||
setOpacity(this->activeOpacity);
|
||||
}
|
||||
|
||||
ToolBoxGraphicsItem::~ToolBoxGraphicsItem()
|
||||
|
@ -39,13 +39,13 @@ ToolBoxGraphicsItem::~ToolBoxGraphicsItem()
|
|||
|
||||
void ToolBoxGraphicsItem::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
|
||||
{
|
||||
startAnimation(QAbstractAnimation::Forward);
|
||||
startAnimation(QAbstractAnimation::Backward);
|
||||
QGraphicsItemGroup::hoverEnterEvent(event);
|
||||
}
|
||||
|
||||
void ToolBoxGraphicsItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
|
||||
{
|
||||
startAnimation(QAbstractAnimation::Backward);
|
||||
startAnimation(QAbstractAnimation::Forward);
|
||||
QGraphicsItemGroup::hoverLeaveEvent(event);
|
||||
}
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ private:
|
|||
void startAnimation(QAbstractAnimation::Direction direction);
|
||||
|
||||
QPropertyAnimation* opacityAnimation;
|
||||
qreal idleOpacity = 0.7f;
|
||||
qreal idleOpacity = 0.0f;
|
||||
qreal activeOpacity = 1.0f;
|
||||
int fadeTimeMs = 300;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user