Move currentLayerChanged logic into existing onLayerChanged

pencil2d · Jul 28, 2024 · e1dd21b · e1dd21b
1 parent e915533
commit e1dd21b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/app/src/timeline.cpp b/app/src/timeline.cpp
@@ -197,12 +197,11 @@ void TimeLine::initUI()
 
     setWindowFlags(Qt::WindowStaysOnTopHint);
 
-    connect(editor()->layers(), &LayerManager::currentLayerChanged, this, &TimeLine::currentLayerChanged);
     connect(mHScrollbar, &QScrollBar::valueChanged, mTracks, &TimeLineCells::hScrollChange);
     connect(mTracks, &TimeLineCells::offsetChanged, mHScrollbar, &QScrollBar::setValue);
     connect(mVScrollbar, &QScrollBar::valueChanged, mTracks, &TimeLineCells::vScrollChange);
     connect(mVScrollbar, &QScrollBar::valueChanged, mLayerList, &TimeLineCells::vScrollChange);
-    connect(mVScrollbar, &QScrollBar::valueChanged, this, &TimeLine::scrollbarValueChanged);
+    connect(mVScrollbar, &QScrollBar::valueChanged, this, &TimeLine::onScrollbarValueChanged);
     connect(mScrollingStoppedTimer, &QTimer::timeout, mLayerList, &TimeLineCells::onScrollingVerticallyStopped);
 
     connect(splitter, &QSplitter::splitterMoved, this, &TimeLine::updateLength);
@@ -239,7 +238,7 @@ void TimeLine::initUI()
 
     LayerManager* layer = editor()->layers();
     connect(layer, &LayerManager::layerCountChanged, this, &TimeLine::updateLayerNumber);
-    connect(layer, &LayerManager::currentLayerChanged, this, &TimeLine::onLayerChanged);
+    connect(layer, &LayerManager::currentLayerChanged, this, &TimeLine::onCurrentLayerChanged);
     mNumLayers = layer->count();
 
     scrubbing = false;
@@ -292,31 +291,12 @@ void TimeLine::wheelEvent(QWheelEvent* event)
     }
 }
 
-void TimeLine::scrollbarValueChanged()
+void TimeLine::onScrollbarValueChanged()
 {
     // After the scrollbar has been updated, prepare to trigger stopped event
     mScrollingStoppedTimer->start(150);
 }
 
-void TimeLine::currentLayerChanged(int layerIndex)
-{
-    // invert index so 0 is at the top
-    int idx = mNumLayers - layerIndex - 1;
-    // number of visible layers
-    int height = mNumLayers - mVScrollbar->maximum();
-    // scroll bar position/offset
-    int pos = mVScrollbar->value();
-
-    if (idx < pos) // above visible area
-    {
-        mVScrollbar->setValue(idx);
-    }
-    else if (idx >= pos + height) // below visible area
-    {
-        mVScrollbar->setValue(idx - height + 1);
-    }
-}
-
 void TimeLine::updateFrame(int frameNumber)
 {
     Q_ASSERT(mTracks);
@@ -390,7 +370,27 @@ void TimeLine::onObjectLoaded()
     updateLayerNumber(editor()->layers()->count());
 }
 
-void TimeLine::onLayerChanged()
+void TimeLine::onCurrentLayerChanged()
 {
+    updateVerticalScrollbarPosition();
     mLayerDeleteButton->setEnabled(editor()->layers()->canDeleteLayer(editor()->currentLayerIndex()));
 }
+
+void TimeLine::updateVerticalScrollbarPosition()
+{
+    // invert index so 0 is at the top
+    int idx = mNumLayers - editor()->currentLayerIndex() - 1;
+    // number of visible layers
+    int height = mNumLayers - mVScrollbar->maximum();
+    // scroll bar position/offset
+    int pos = mVScrollbar->value();
+
+    if (idx < pos) // above visible area
+    {
+        mVScrollbar->setValue(idx);
+    }
+    else if (idx >= pos + height) // below visible area
+    {
+        mVScrollbar->setValue(idx - height + 1);
+    }
+}
diff --git a/app/src/timeline.h b/app/src/timeline.h
@@ -55,9 +55,8 @@ class TimeLine : public BaseDockWidget
     int getRangeUpper();
 
     void onObjectLoaded();
-    void onLayerChanged();
-
-    void scrollbarValueChanged();
+    void onCurrentLayerChanged();
+    void onScrollbarValueChanged();
 
 signals:
     void selectionChanged();
@@ -89,6 +88,8 @@ class TimeLine : public BaseDockWidget
     void wheelEvent( QWheelEvent* ) override;
 
 private:
+    void updateVerticalScrollbarPosition();
+
     QScrollBar* mHScrollbar = nullptr;
     QScrollBar* mVScrollbar = nullptr;
     TimeLineCells* mTracks = nullptr;