zach/z-bar-qt
1
1
Fork 0
Code Issues 23 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

flick velocity and deceleration
C++ / fmt (pull_request) Successful in 3s
Details
JS/TS / fmt (pull_request) Successful in 15s
Details
JS/TS / lint (pull_request) Successful in 17s
Details
Python / static (pull_request) Successful in 58s
Details
Rust / fmt (pull_request) Successful in 1m4s
Details
Rust / build (pull_request) Successful in 2m14s
Details
C++ / build (pull_request) Successful in 2m36s
Details
Rust / clippy (pull_request) Successful in 1m30s
Details
Python / verify (pull_request) Successful in 2m53s
Details
C++ / clang-tidy (pull_request) Successful in 4m4s
Details

Browse Source
This commit is contained in:
zach
2026-08-17 10:37:00 +02:00
parent 31f73b05e4
commit babfe4b3de
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/ZShell/Components/carouselview.cpp
+34 -43
View File
@@ -46,7 +46,7 @@ CarouselView::CarouselView(QQuickItem* parent) : QQuickItem(parent) {
});
m_flickAnim = new QVariantAnimation(this);
m_flickAnim->setEasingCurve(QEasingCurve::Linear);
m_flickAnim->setEasingCurve(QEasingCurve::OutQuad);
connect(
m_flickAnim,
@@ -101,9 +101,8 @@ bool CarouselView::childMouseEventFilter(QQuickItem* item, QEvent* event) {
m_dragTimer.start();
m_lastMoveX = pos.x();
m_lastMoveT = 0;
m_velocity = 0;
m_velocitySamples.clear();
addVelocitySample(0, pos.x());
return false;
}
@@ -129,17 +128,7 @@ bool CarouselView::childMouseEventFilter(QQuickItem* item, QEvent* event) {
updateCurrentIndexFromContentX(true);
relayout();
const qint64 t = m_dragTimer.elapsed();
const qint64 dt = t - m_lastMoveT;
if (dt > 0) {
const qreal instVel = (m_lastMoveX - pos.x()) / (dt / 1000.0);
m_velocity = m_velocity * 0.7 + instVel * 0.3;
}
m_lastMoveX = pos.x();
m_lastMoveT = t;
addVelocitySample(m_dragTimer.elapsed(), pos.x());
mouseEvent->accept();
return true;
@@ -1141,10 +1130,8 @@ void CarouselView::mousePressEvent(QMouseEvent* event) {
m_dragTimer.start();
m_lastMoveX = event->position().x();
m_lastMoveT = 0;
m_velocity = 0;
m_velocitySamples.clear();
addVelocitySample(0, event->position().x());
event->accept();
}
@@ -1170,32 +1157,43 @@ void CarouselView::mouseMoveEvent(QMouseEvent* event) {
updateCurrentIndexFromContentX(true);
relayout();
const qint64 t = m_dragTimer.elapsed();
const qint64 dt = t - m_lastMoveT;
if (dt > 0) {
const qreal instVel =
(m_lastMoveX - event->position().x()) / (dt / 1000.0);
m_velocity = m_velocity * 0.7 + instVel * 0.3;
}
m_lastMoveX = event->position().x();
m_lastMoveT = t;
addVelocitySample(m_dragTimer.elapsed(), event->position().x());
event->accept();
}
void CarouselView::addVelocitySample(qint64 t, qreal x) {
m_velocitySamples.append({t, x});
while (m_velocitySamples.size() > 1 &&
t - m_velocitySamples.first().t > kVelocitySampleWindowMs) {
m_velocitySamples.removeFirst();
}
}
qreal CarouselView::sampledVelocity() const {
if (m_velocitySamples.size() < 2) return 0;
const VelocitySample& oldest = m_velocitySamples.first();
const VelocitySample& newest = m_velocitySamples.last();
const qreal dt = newest.t - oldest.t;
if (dt < 8) return 0;
return (oldest.x - newest.x) / (dt / 1000.0);
}
void CarouselView::mouseReleaseEvent(QMouseEvent* event) {
if (!m_dragging) return;
m_dragging = false;
const bool wasDragActive = m_dragActive;
ungrabMouse();
if (!m_dragActive) {
if (!wasDragActive) {
cancelAnimations();
snapToNearest();
@@ -1205,7 +1203,7 @@ void CarouselView::mouseReleaseEvent(QMouseEvent* event) {
m_dragActive = false;
qreal v = qBound(-kMaxFlickVelocity, m_velocity, kMaxFlickVelocity);
qreal v = qBound(-kMaxFlickVelocity, sampledVelocity(), kMaxFlickVelocity);
if (std::abs(v) < kMinFlickVelocity) {
snapToNearest();
@@ -1215,24 +1213,17 @@ void CarouselView::mouseReleaseEvent(QMouseEvent* event) {
}
const qreal duration = std::abs(v) / (kFlickFriction * 1000.0);
const qreal distance = (v * (duration / 1000.0)) / 2.0;
const qreal rawDest = m_contentX + distance;
const qreal dest = contentXForIndex(indexForContentX(rawDest));
cancelAnimations();
m_flickAnim->setDuration(
static_cast<int>(qBound<qreal>(120, duration, 900)));
m_flickAnim->setEasingCurve(QEasingCurve::OutCubic);
m_flickAnim->setEasingCurve(QEasingCurve::OutQuad);
m_flickAnim->setStartValue(m_contentX);
m_flickAnim->setEndValue(dest);
m_flickAnim->start();
event->accept();