Merge branch 'main' into parent-influence-v3

Author: rodlie

.gitignore

@@ -15,7 +15,6 @@ quazip
 snapshots
 .vscode
 build-*
-*.diff
 *.patch
 ffmpeg
 *.7z

src/app/GUI/graphboxeslist.cpp

@@ -488,18 +488,19 @@ void KeysView::graphDeletePressed() {
     mGPressedPoint = nullptr;
 }
 
-void KeysView::graphWheelEvent(QWheelEvent *event)
+void KeysView::graphWheelEvent(QWheelEvent *event,
+                               const qreal &hframe)
 {
 #ifdef Q_OS_MAC
     if (event->angleDelta().y() == 0) { return; }
 #endif
     const bool ctrl = (event->modifiers() & Qt::ControlModifier);
     const bool shift = (event->modifiers() & Qt::ShiftModifier);
     if (ctrl && !shift) {
-        emit wheelEventSignal(event);
+        emit wheelEventSignal(event, hframe);
         return;
     } else if (ctrl || shift) {
-        if (ctrl) { emit wheelEventSignal(event); }
+        if (ctrl) { emit wheelEventSignal(event, hframe); }
         qreal valUnderMouse;
         qreal frame;
         const auto ePos = event->position();

src/app/GUI/keysview.cpp

@@ -136,6 +136,8 @@ void KeysView::middleMove(const QPointF &movePos) {
     const int roundX = qRound(diffFrame);
     setFramesRange({mSavedMinViewedFrame - roundX,
                     mSavedMaxViewedFrame - roundX});
+
+    emit changedViewedFrames({mMinViewedFrame, mMaxViewedFrame});
 }
 
 void KeysView::deleteSelectedKeys() {
@@ -239,10 +241,16 @@ void KeysView::wheelEvent(QWheelEvent *e)
         if (mPanEvent) { emit panEventSignal(e); }
     }
 #endif
+
+    const QPoint pos = e->pos();
+    const QPoint posU = pos + QPoint(-eSizesUI::widget/2, 0);
+    const qreal currentHoverFrame = static_cast<qreal>(posU.x()) / mPixelsPerFrame + mMinViewedFrame;
+    // qDebug() << "currentHoverFrame" << currentHoverFrame;
+
     if (mGraphViewed) {
-        if (!mPanEvent) { graphWheelEvent(e); }
+        if (!mPanEvent) { graphWheelEvent(e, currentHoverFrame); }
     } else {
-        if (!mPanEvent) { emit wheelEventSignal(e); }
+        if (!mPanEvent) { emit wheelEventSignal(e, currentHoverFrame); }
         if (mSelecting) {
             const QPointF posU = mapFromGlobal(QCursor::pos()) +
                            QPointF(-eSizesUI::widget/2, 0.);
@@ -507,7 +515,12 @@ bool KeysView::event(QEvent *e)
         auto g = dynamic_cast<QNativeGestureEvent*>(e);
         if (g->gestureType() == Qt::ZoomNativeGesture ||
             g->gestureType() == Qt::SmartZoomNativeGesture) {
-            emit nativeEventSignal(g);
+            const QPoint globalMousePos = QCursor::pos();
+            const QPoint localMousePos = mapFromGlobal(globalMousePos);
+            const QPoint posU = localMousePos + QPoint(-eSizesUI::widget/2, 0);
+            const qreal currentHoverFrame = static_cast<qreal>(posU.x()) / mPixelsPerFrame + mMinViewedFrame;
+            // qDebug() << "currentHoverFrame" << currentHoverFrame;
+            emit nativeEventSignal(g, currentHoverFrame);
             return true;
         }
     }

src/app/GUI/keysview.h

@@ -88,7 +88,8 @@ class KeysView : public QWidget, public KeyFocusTarget {
     // graph
 
     void graphPaint(QPainter *p);
-    void graphWheelEvent(QWheelEvent *event);
+    void graphWheelEvent(QWheelEvent *event,
+                         const qreal &hframe);
     bool graphProcessFilteredKeyEvent(QKeyEvent *event);
     void graphResizeEvent(QResizeEvent *);
     void graphAddViewedAnimator(GraphAnimator * const animator);
@@ -145,11 +146,13 @@ class KeysView : public QWidget, public KeyFocusTarget {
     void dragMoveEvent(QDragMoveEvent *event);
 signals:
     void changedViewedFrames(FrameRange);
-    void wheelEventSignal(QWheelEvent*);
+    void wheelEventSignal(QWheelEvent *e,
+                          const qreal &frame);
     void statusMessage(const QString &message);
 
 #ifdef Q_OS_MAC
-    void nativeEventSignal(QNativeGestureEvent *e);
+    void nativeEventSignal(QNativeGestureEvent *e,
+                           const qreal &frame);
     void panEventSignal(QWheelEvent *e);
 #endif
 

src/app/GUI/timelinedockwidget.cpp

@@ -63,6 +63,7 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
     , mRenderProgressAct(nullptr)
     , mRenderProgress(nullptr)
     , mStepPreviewTimer(nullptr)
+    , mPausedPreviewState({false, 0})
 {
     connect(RenderHandler::sInstance, &RenderHandler::previewFinished,
             this, &TimelineDockWidget::previewFinished);
@@ -438,6 +439,7 @@ bool TimelineDockWidget::processKeyPress(QKeyEvent *event)
 
 void TimelineDockWidget::previewFinished()
 {
+    mPausedPreviewState.first = false;
     if (const auto scene = *mDocument.fActiveScene) {
         scene->setGizmosSuppressed(false);
     }
@@ -490,6 +492,8 @@ void TimelineDockWidget::previewBeingRendered()
 
 void TimelineDockWidget::previewPaused()
 {
+    mPausedPreviewState = {true, mDocument.getActiveSceneFrame()};
+
     if (const auto scene = *mDocument.fActiveScene) {
         scene->setGizmosSuppressed(false);
     }
@@ -543,6 +547,14 @@ bool TimelineDockWidget::setPrevKeyframe()
 void TimelineDockWidget::resumePreview()
 {
     if (eSettings::instance().fPreviewCache) {
+        if (mPausedPreviewState.first) {
+            const int frame = mDocument.getActiveSceneFrame();
+            if (mPausedPreviewState.second != frame) {
+                qDebug() << "set new start frame for preview" << frame;
+                RenderHandler::sInstance->setPreviewFrame(frame);
+                mPausedPreviewState.first = false;
+            }
+        }
         RenderHandler::sInstance->resumePreview();
     } else { setStepPreviewStart(); }
 }

src/app/GUI/timelinedockwidget.h

@@ -141,6 +141,8 @@ class TimelineDockWidget : public QWidget
 
     QList<TimelineWidget*> mTimelineWidgets;
     //AnimationDockWidget *mAnimationDockWidget;
+
+    QPair<bool,int> mPausedPreviewState;
 };
 
 #endif // BOXESLISTANIMATIONDOCKWIDGET_H

src/app/GUI/timelinewidget.cpp

@@ -325,10 +325,13 @@ void TimelineWidget::setCurrentScene(Canvas * const scene) {
     mBoxesListWidget->setCurrentScene(scene);
     mKeysView->setCurrentScene(scene);
     if(scene) {
-        setCanvasFrameRange(scene->getFrameRange());
+        const auto range = scene->getFrameRange();
+        setCanvasFrameRange(range);
         mFrameScrollBar->setFirstViewedFrame(scene->getCurrentFrame());
         mFrameRangeScrollBar->setFirstViewedFrame(scene->getCurrentFrame());
-        setViewedFrameRange(mFrameRangeScrollBar->getViewedRange());
+        const int padding = 2;
+        const FrameRange newRange = {range.fMin - padding, range.fMax + padding};
+        setViewedFrameRange(newRange);
 
         connect(scene, &Canvas::currentFrameChanged,
                 mFrameScrollBar, &FrameScrollBar::setFirstViewedFrame);

src/app/friction.qss

@@ -295,6 +295,7 @@ QToolButton::menu-button {
 
 QPushButton::menu-indicator,
 QToolButton#ToolButton::menu-indicator,
+QPushButton#NoButton::menu-indicator,
 QToolButton#FlatButton::menu-indicator { width: 0px; }
 
 QLineEdit#SearchLine {
@@ -341,15 +342,17 @@ QPushButton#WelcomeRecentButton:hover {
 
 QPushButton#FlatButton,
 QPushButton#AboutButton,
-QToolButton#FlatButton {
+QToolButton#FlatButton,
+QPushButton#NoButton {
     background-color: none;
     border: 0;
     border-radius: 2%;
 }
 
 QPushButton#FlatButton,
 QPushButton#AboutButton,
-QToolButton#FlatButton {
+QToolButton#FlatButton,
+QPushButton#NoButton {
     border-radius: 2%;
 }
 
@@ -359,6 +362,10 @@ QToolButton#FlatButton:hover {
     border-color: rgb(104, 144, 206);
 }
 
+QPushButton#NoButton:hover {
+    background-color: none;
+}
+
 QPushButton#AboutButton:hover {
     background-color: none;
 }

src/app/icons

@@ -120,6 +120,11 @@ void RenderHandler::renderFromSettings(RenderInstanceSettings * const settings)
     }
 }
 
+void RenderHandler::setPreviewFrame(const int &frame)
+{
+    mCurrentPreviewFrame = frame;
+}
+
 void RenderHandler::setLoop(const bool loop) {
     mLoop = loop;
 }