up

Author: plyght

src/app/BrowserWindow.cpp

@@ -69,6 +69,12 @@
 
 namespace {
 
+QEasingCurve responsiveEaseOut() {
+    QEasingCurve curve(QEasingCurve::BezierSpline);
+    curve.addCubicBezierSegment(QPointF(0.23, 1.0), QPointF(0.32, 1.0), QPointF(1.0, 1.0));
+    return curve;
+}
+
 void setButtonSymbolSmooth(QToolButton *button, const QString &symbol, double pointSize, const QColor &color) {
     if (!button) return;
     const QString previousSymbol = button->property("sfSymbolName").toString();
@@ -90,17 +96,17 @@ void setButtonSymbolSmooth(QToolButton *button, const QString &symbol, double po
         button->setGraphicsEffect(effect);
     }
     auto *out = new QPropertyAnimation(effect, "opacity", button);
-    out->setDuration(45);
+    out->setDuration(55);
     out->setStartValue(effect->opacity());
     out->setEndValue(0.35);
-    out->setEasingCurve(QEasingCurve::OutCubic);
+    out->setEasingCurve(responsiveEaseOut());
     QObject::connect(out, &QPropertyAnimation::finished, button, [button, effect, applyIcon] {
         applyIcon();
         auto *in = new QPropertyAnimation(effect, "opacity", button);
-        in->setDuration(45);
+        in->setDuration(70);
         in->setStartValue(effect->opacity());
         in->setEndValue(1.0);
-        in->setEasingCurve(QEasingCurve::OutCubic);
+        in->setEasingCurve(responsiveEaseOut());
         QObject::connect(in, &QPropertyAnimation::finished, in, &QObject::deleteLater);
         in->start();
     });
@@ -527,7 +533,11 @@ void BrowserWindow::splitTabs(WebView *first, WebView *second, const QPoint &glo
         };
         syncPaneNav();
         connect(view, &WebView::navigationStateChanged, toolbar.bar, syncPaneNav);
-        connect(toolbar.sidebar, &QToolButton::clicked, this, [this] { if (m_sidebar && m_sidebarWidget) m_sidebar->setHidden(m_sidebarWidget->isVisible()); });
+        connect(toolbar.sidebar, &QToolButton::clicked, this, [this] {
+            if (!m_sidebar || !m_sidebarWidget) return;
+            if (m_sidebarWidget->isVisible()) m_sidebar->setHidden(true);
+            else m_sidebar->expandAnimated();
+        });
         connect(toolbar.back, &QToolButton::clicked, view, [viewGuard] { if (viewGuard) viewGuard->back(); });
         connect(toolbar.forward, &QToolButton::clicked, view, [viewGuard] { if (viewGuard) viewGuard->forward(); });
         connect(toolbar.reload, &QToolButton::clicked, view, [viewGuard] { if (viewGuard) { if (viewGuard->isLoading()) viewGuard->stop(); else viewGuard->reload(); } });
@@ -865,7 +875,11 @@ QWidget *BrowserWindow::buildTopbar(QWidget *parent) {
         if (auto *v = currentView()) v->setFocus();
     });
 
-    connect(m_sidebarBtn, &QToolButton::clicked, this, [this] { if (m_sidebar && m_sidebarWidget) m_sidebar->setHidden(m_sidebarWidget->isVisible()); });
+    connect(m_sidebarBtn, &QToolButton::clicked, this, [this] {
+        if (!m_sidebar || !m_sidebarWidget) return;
+        if (m_sidebarWidget->isVisible()) m_sidebar->setHidden(true);
+        else m_sidebar->expandAnimated();
+    });
     connect(m_backBtn,   &QToolButton::clicked, this, [this] { if (auto *v = currentView()) v->back(); });
     connect(m_fwdBtn,    &QToolButton::clicked, this, [this] { if (auto *v = currentView()) v->forward(); });
     connect(m_reloadBtn, &QToolButton::clicked, this, [this] { if (auto *v = currentView()) { if (v->isLoading()) v->stop(); else v->reload(); } });
@@ -1022,8 +1036,8 @@ void BrowserWindow::settleSidebarSwipe(bool commit) {
     m_sidebarSwipeAnim = driver;
     driver->setStartValue(startOffset);
     driver->setEndValue(commit ? (direction > 0 ? -width : width) : 0);
-    driver->setDuration(commit ? 160 : 120);
-    driver->setEasingCurve(QEasingCurve::OutCubic);
+    driver->setDuration(commit ? 150 : 105);
+    driver->setEasingCurve(responsiveEaseOut());
     m_sidebarSwipeSettling = true;
     connect(driver, &QVariantAnimation::valueChanged, this, [this](const QVariant &value) {
         setSidebarSwipeOffset(value.toInt());
@@ -1056,10 +1070,10 @@ void BrowserWindow::animateProfileSwitcher(int direction) {
     QRect start = end.translated(direction > 0 ? 18 : -18, 0);
     m_profileBtn->setGeometry(start);
     m_profileAnim = new QPropertyAnimation(m_profileBtn, "geometry", this);
-    m_profileAnim->setDuration(180);
+    m_profileAnim->setDuration(155);
     m_profileAnim->setStartValue(start);
     m_profileAnim->setEndValue(end);
-    m_profileAnim->setEasingCurve(QEasingCurve::OutCubic);
+    m_profileAnim->setEasingCurve(responsiveEaseOut());
     QPropertyAnimation *anim = m_profileAnim;
     connect(anim, &QPropertyAnimation::finished, anim, &QObject::deleteLater);
     connect(anim, &QObject::destroyed, this, [this, anim] { if (m_profileAnim == anim) m_profileAnim = nullptr; });
@@ -1580,14 +1594,10 @@ void BrowserWindow::setupActions() {
         auto *side = m_splitter->widget(0);
         if (!side) return;
         const bool nowVisible = !side->isVisible();
-        m_sidebar->setHidden(!nowVisible);
         if (nowVisible) {
-            QTimer::singleShot(0, this, [this, side] {
-                const int saved = QSettings().value("ui/sidebarWidth", ui::metrics::SidebarDefaultWidth).toInt();
-                const int target = qBound(side->minimumWidth(), saved, side->maximumWidth());
-                const int total = m_splitter->size().width();
-                m_splitter->setSizes({target, qMax(0, total - target - m_splitter->handleWidth())});
-            });
+            m_sidebar->expandAnimated();
+        } else {
+            m_sidebar->setHidden(true);
         }
     };
 

src/mac/MacIntegration.hpp

@@ -2,6 +2,7 @@
 
 #include <QIcon>
 #include <QPoint>
+#include <QRect>
 #include <QString>
 #include <QStringList>
 #include <QVector>
@@ -98,6 +99,12 @@ void sendStandardEditAction(const char *selector);
 
 void performHapticFeedback();
 
+void animateWindowFrame(QWidget *window,
+                        const QRect &from,
+                        const QRect &to,
+                        int durationMs,
+                        std::function<void()> completion = {});
+
 bool showNativePageActionsMenu(QWidget *anchor,
                                std::function<void()> copyUrl,
                                std::function<void()> reload,

src/mac/MacInternal.mm

@@ -20,6 +20,7 @@
 #include "MacIntegration.hpp"
 #import <AppKit/AppKit.h>
 #import <AppKit/NSGlassEffectView.h>
+#import <QuartzCore/QuartzCore.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
 
@@ -241,6 +242,14 @@ static bool pocbShowGlassMenu(NSWindow *owner,
 
 namespace mac {
 
+static NSRect pocbNSWindowFrameFromQRect(const QRect &rect, NSScreen *preferredScreen) {
+    NSScreen *screen = preferredScreen ?: NSScreen.mainScreen;
+    if (!screen) return NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
+    const NSRect screenFrame = screen.frame;
+    const CGFloat y = NSMaxY(screenFrame) - rect.y() - rect.height();
+    return NSMakeRect(rect.x(), y, rect.width(), rect.height());
+}
+
 void performHapticFeedback() {
     [[NSHapticFeedbackManager defaultPerformer] performFeedbackPattern:NSHapticFeedbackPatternGeneric performanceTime:NSHapticFeedbackPerformanceTimeDefault];
 }
@@ -251,6 +260,35 @@ void sendStandardEditAction(const char *selector) {
     [NSApp sendAction:sel to:nil from:nil];
 }
 
+void animateWindowFrame(QWidget *window,
+                        const QRect &from,
+                        const QRect &to,
+                        int durationMs,
+                        std::function<void()> completion) {
+    if (!window) {
+        if (completion) completion();
+        return;
+    }
+    NSWindow *nsWindow = mac::internal::nsWindowOf(window);
+    if (!nsWindow) {
+        window->setGeometry(to);
+        if (completion) completion();
+        return;
+    }
+    NSScreen *screen = nsWindow.screen ?: NSScreen.mainScreen;
+    [nsWindow setFrame:pocbNSWindowFrameFromQRect(from, screen) display:YES];
+    auto *completionCopy = new std::function<void()>(std::move(completion));
+    [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+        context.duration = qMax(0, durationMs) / 1000.0;
+        context.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
+        [[nsWindow animator] setFrame:pocbNSWindowFrameFromQRect(to, screen) display:YES];
+    } completionHandler:^{
+        window->setGeometry(to);
+        if (*completionCopy) (*completionCopy)();
+        delete completionCopy;
+    }];
+}
+
 bool showNativeContextMenu(QWidget *anchor,
                            const QPoint &globalPos,
                            const QStringList &titles,
@@ -366,6 +404,15 @@ bool showNativePageActionsMenu(QWidget *anchor,
 
 namespace mac {
 
+void animateWindowFrame(QWidget *window,
+                        const QRect &,
+                        const QRect &to,
+                        int,
+                        std::function<void()> completion) {
+    if (window) window->setGeometry(to);
+    if (completion) completion();
+}
+
 bool showNativePageActionsMenu(QWidget *,
                                std::function<void()>,
                                std::function<void()>,

src/tabs/TabTree.cpp

@@ -308,7 +308,7 @@ TabTree::TabTree(ProfileStore &profiles, FaviconService *favicons, QWidget *stac
     m_tabs->setAllColumnsShowFocus(false);
     m_tabs->setSelectionMode(QAbstractItemView::NoSelection);
     m_tabs->setFocusPolicy(Qt::NoFocus);
-    m_tabs->setAnimated(true);
+    m_tabs->setAnimated(false);
     m_tabs->setFrameShape(QFrame::NoFrame);
     m_tabs->setIconSize(QSize(14, 14));
     m_tabs->setExpandsOnDoubleClick(false);

src/ui/ChromeWidgets.cpp

@@ -18,6 +18,12 @@ QColor lerp(const QColor &a, const QColor &b, qreal t) {
                             a.blueF()  + (b.blueF()  - a.blueF())  * t,
                             a.alphaF() + (b.alphaF() - a.alphaF()) * t);
 }
+
+QEasingCurve responsiveEaseOut() {
+    QEasingCurve curve(QEasingCurve::BezierSpline);
+    curve.addCubicBezierSegment(QPointF(0.23, 1.0), QPointF(0.32, 1.0), QPointF(1.0, 1.0));
+    return curve;
+}
 }  // namespace
 
 // ---- ChromeBar ----------------------------------------------------------
@@ -27,8 +33,8 @@ ChromeBar::ChromeBar(QWidget *parent)
     setAttribute(Qt::WA_StyledBackground, false);
     setAutoFillBackground(false);
     m_anim = new QVariantAnimation(this);
-    m_anim->setDuration(220);
-    m_anim->setEasingCurve(QEasingCurve::OutCubic);
+    m_anim->setDuration(180);
+    m_anim->setEasingCurve(responsiveEaseOut());
     connect(m_anim, &QVariantAnimation::valueChanged, this, [this](const QVariant &v) {
         m_bg = v.value<QColor>();
         update();
@@ -74,15 +80,15 @@ AddrPill::AddrPill(QWidget *parent) : QWidget(parent) {
     setAttribute(Qt::WA_StyledBackground, false);
     setAutoFillBackground(false);
     m_anim = new QVariantAnimation(this);
-    m_anim->setDuration(140);
-    m_anim->setEasingCurve(QEasingCurve::OutCubic);
+    m_anim->setDuration(125);
+    m_anim->setEasingCurve(responsiveEaseOut());
     connect(m_anim, &QVariantAnimation::valueChanged, this, [this](const QVariant &v) {
         m_progress = v.toDouble();
         update();
     });
     m_loadAnim = new QVariantAnimation(this);
-    m_loadAnim->setDuration(130);
-    m_loadAnim->setEasingCurve(QEasingCurve::OutCubic);
+    m_loadAnim->setDuration(115);
+    m_loadAnim->setEasingCurve(responsiveEaseOut());
     connect(m_loadAnim, &QVariantAnimation::valueChanged, this, [this](const QVariant &v) {
         m_loadCurrent = v.toDouble();
         update();
@@ -124,13 +130,13 @@ void AddrPill::setLoadProgress(int percent) {
     }
     if (percent >= 100) {
         m_loadAnim->setEndValue(100.0);
-        m_loadAnim->setDuration(115);
+        m_loadAnim->setDuration(90);
     } else {
         if (m_loadPulseAnim->state() != QAbstractAnimation::Running) m_loadPulseAnim->start();
         const qreal visualTarget = qMax((qreal)percent, 96.0);
         m_loadAnim->setEndValue(visualTarget);
         const int delta = qAbs(qRound(visualTarget - m_loadCurrent));
-        m_loadAnim->setDuration(qBound(70, 28 + delta * 3, 145));
+        m_loadAnim->setDuration(qBound(60, 24 + delta * 2, 120));
     }
     m_loadAnim->start();
 }

src/ui/LayoutMetrics.hpp

@@ -29,8 +29,10 @@ inline constexpr int StackHostRightInset = 6;
 inline constexpr int StackHostBottomInset = 6;
 inline constexpr int FloatingSidebarSideGap = 8;
 inline constexpr int FloatingSidebarBottomGap = 8;
-inline constexpr int FloatingDismissDelayMs = 180;
-inline constexpr int FloatingSlideDurationMs = 160;
+inline constexpr int FloatingDismissDelayMs = 240;
+inline constexpr int FloatingSlideInDurationMs = 190;
+inline constexpr int FloatingSlideOutDurationMs = 135;
+inline constexpr int FloatingSlideTravelPx = 28;
 inline constexpr int DockedSidebarTopInset = UnifiedToolbarHeight;
 inline constexpr int DockedSidebarLeftInset = 10;
 inline constexpr int DockedSidebarRightInset = 0;