aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp')
-rw-r--r--src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
index 29e88e2581d..18d838d2ff1 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
@@ -71,10 +71,6 @@ CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent)
box->addWidget(m_statusLine);
setLayout(box);
- connect(m_toolbar, &CurveEditorToolBar::defaultClicked, [this]() {
- m_view->setDefaultInterpolation();
- });
-
connect(m_toolbar, &CurveEditorToolBar::unifyClicked, [this]() {
m_view->toggleUnified();
});
@@ -99,6 +95,13 @@ CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent)
m_view->viewport()->update();
});
+ connect(m_toolbar, &CurveEditorToolBar::zoomChanged, [this](double zoom) {
+ const bool wasBlocked = m_view->blockSignals(true);
+ m_view->setZoomX(zoom);
+ m_view->blockSignals(wasBlocked);
+ m_view->viewport()->update();
+ });
+
connect(
m_view, &GraphicsView::currentFrameChanged,
m_toolbar, &CurveEditorToolBar::setCurrentFrame);
@@ -110,6 +113,11 @@ CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent)
m_tree->selectionModel(), &SelectionModel::curvesSelected,
m_view, &GraphicsView::updateSelection);
+ connect(m_view, &GraphicsView::zoomChanged, [this](double x, double y) {
+ Q_UNUSED(y);
+ m_toolbar->setZoom(x);
+ });
+
auto updateTimeline = [this, model](bool validTimeline) {
if (validTimeline) {
updateStatusLine();