diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
commit | d49d076431d7579ecb33147187fe07eb148112ba (patch) | |
tree | 668370fb9a2eec50000e371125136921ef4518ab /examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp | |
parent | b01e69684b9b36492cc43472edeb72058be9f706 (diff) | |
parent | 35cdcddd605d8823b7b57129e8d7279133a3ca89 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic1fd51143f903b7e9086fc19ca960dfd9654ee00
Diffstat (limited to 'examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp')
-rw-r--r-- | examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp index f510ebc07f..6eda94e8ba 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp @@ -50,14 +50,13 @@ #include "customproxy.h" -#include <QStyleOptionGraphicsItem> -#include <QPainter> #include <QGraphicsScene> +#include <QPainter> +#include <QStyleOptionGraphicsItem> CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags) - : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(nullptr) + : QGraphicsProxyWidget(parent, wFlags), timeLine(new QTimeLine(250, this)) { - timeLine = new QTimeLine(250, this); connect(timeLine, &QTimeLine::valueChanged, this, &CustomProxy::updateStep); connect(timeLine, &QTimeLine::stateChanged, @@ -99,7 +98,7 @@ void CustomProxy::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { QGraphicsProxyWidget::hoverEnterEvent(event); scene()->setActiveWindow(this); - if (timeLine->currentValue() != 1) + if (qFuzzyCompare(timeLine->currentValue(), 1)) zoomIn(); } @@ -107,7 +106,7 @@ void CustomProxy::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { QGraphicsProxyWidget::hoverLeaveEvent(event); if (!popupShown - && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0)) { + && (timeLine->direction() != QTimeLine::Backward || qFuzzyIsNull(timeLine->currentValue()))) { zoomOut(); } } |