aboutsummaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-01-16 16:39:14 -0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-17 08:06:33 +1300
commit67865a86be1f22231037d2209baa731fac55ad4e (patch)
treee248b3b589620b74b48484f52484e6f98a6225ff /qt-ui
parent85909ca28d4a14e079908123c4eb00201278fe24 (diff)
downloadsubsurface-67865a86be1f22231037d2209baa731fac55ad4e.tar.gz
Honor prefs.anim_speed on the ToolTip animations
The tooltip animation had a fixed animation speed, this patch honors the anim_speed on the preferences, and also disables the animation completely if the speed == 0. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/profile/divetooltipitem.cpp28
1 files changed, 18 insertions, 10 deletions
diff --git a/qt-ui/profile/divetooltipitem.cpp b/qt-ui/profile/divetooltipitem.cpp
index b07c72976..821c4a695 100644
--- a/qt-ui/profile/divetooltipitem.cpp
+++ b/qt-ui/profile/divetooltipitem.cpp
@@ -70,11 +70,15 @@ void ToolTipItem::collapse()
{
int dim = defaultIconMetrics().sz_small;
- QPropertyAnimation *animation = new QPropertyAnimation(this, "rect");
- animation->setDuration(100);
- animation->setStartValue(nextRectangle);
- animation->setEndValue(QRect(0, 0, dim, dim));
- animation->start(QAbstractAnimation::DeleteWhenStopped);
+ if (prefs.animation_speed) {
+ QPropertyAnimation *animation = new QPropertyAnimation(this, "rect");
+ animation->setDuration(100);
+ animation->setStartValue(nextRectangle);
+ animation->setEndValue(QRect(0, 0, dim, dim));
+ animation->start(QAbstractAnimation::DeleteWhenStopped);
+ } else {
+ setRect(nextRectangle);
+ }
clear();
status = COLLAPSED;
@@ -115,11 +119,15 @@ void ToolTipItem::expand()
nextRectangle.setHeight(height);
if (nextRectangle != rect()) {
- QPropertyAnimation *animation = new QPropertyAnimation(this, "rect", this);
- animation->setDuration(100);
- animation->setStartValue(rect());
- animation->setEndValue(nextRectangle);
- animation->start(QAbstractAnimation::DeleteWhenStopped);
+ if (prefs.animation_speed) {
+ QPropertyAnimation *animation = new QPropertyAnimation(this, "rect", this);
+ animation->setDuration(prefs.animation_speed);
+ animation->setStartValue(rect());
+ animation->setEndValue(nextRectangle);
+ animation->start(QAbstractAnimation::DeleteWhenStopped);
+ } else {
+ setRect(nextRectangle);
+ }
}
status = EXPANDED;