diff options
| author |  jan Iversen <jani@apache.org> | 2018-08-20 11:51:48 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-25 11:49:47 -0700 |
| commit | ebc0e6d3f3edb90851295399dd22e081fe00a0c8 (patch) | |
| tree | 5d08f827e6ed92eb26a778b540e132dbfad5742a /profile-widget/divetooltipitem.cpp | |
| parent | 82b626b3fdd82bbe251d56a9972941ed207825a3 (diff) | |
| download | subsurface-ebc0e6d3f3edb90851295399dd22e081fe00a0c8.tar.gz | |
core/tests: merge Animations and add vars. to qPrefDisplay
Add class variable tooltip_position to qPrefDisplay
Add class variable lastDir to qPrefDisplay
qPrefDisplay is updated to use new qPrefPrivate functions
Adjust test cases incl. qml tests
qPrefAnimations only has 1 variable, that really is a display variable
Merge the variable into qPrefDisplay, to simplify setup (and avoid loading
extra page in qml).
correct theme to save in correct place, and make it a static
class variable
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'profile-widget/divetooltipitem.cpp')
| -rw-r--r-- | profile-widget/divetooltipitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index 21bf82c13..363382324 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/profile-widget/divetooltipitem.cpp @@ -4,7 +4,7 @@ #include "core/profile.h" #include "core/membuffer.h" #include "core/metrics.h" -#include "core/settings/qPrefAnimations.h" +#include "core/settings/qPrefDisplay.h" #include <QPropertyAnimation> #include <QSettings> #include <QGraphicsView> @@ -62,7 +62,7 @@ void ToolTipItem::collapse() { int dim = defaultIconMetrics().sz_small; - if (qPrefAnimations::animation_speed()) { + if (qPrefDisplay::animation_speed()) { QPropertyAnimation *animation = new QPropertyAnimation(this, "rect"); animation->setDuration(100); animation->setStartValue(nextRectangle); @@ -120,7 +120,7 @@ void ToolTipItem::expand() nextRectangle.setHeight(height); if (nextRectangle != rect()) { - if (qPrefAnimations::animation_speed()) { + if (qPrefDisplay::animation_speed()) { QPropertyAnimation *animation = new QPropertyAnimation(this, "rect", this); animation->setDuration(prefs.animation_speed); animation->setStartValue(rect()); |