Fix a regression with TopBar2

g123k · Jan 30, 2025 · 351a329 · 351a329
1 parent ff02ec8
commit 351a329
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/packages/smooth_app/lib/widgets/selector_screen/smooth_screen_list_choice.dart b/packages/smooth_app/lib/widgets/selector_screen/smooth_screen_list_choice.dart
@@ -60,6 +60,7 @@ class SmoothSelectorScreen<T> extends StatelessWidget {
             leadingAction: provider.autoValidate
                 ? SmoothTopBarLeadingAction.minimize
                 : SmoothTopBarLeadingAction.close,
+            elevationOnScroll: false,
           ),
           bottomBar: !provider.autoValidate
               ? _SmoothSelectorScreenBottomBar<T>(

diff --git a/packages/smooth_app/lib/widgets/v2/smooth_topbar2.dart b/packages/smooth_app/lib/widgets/v2/smooth_topbar2.dart
@@ -54,6 +54,7 @@ class SmoothTopBar2 extends StatefulWidget implements PreferredSizeWidget {
 
 class _SmoothTopBar2State extends State<SmoothTopBar2> {
   late double _progress = 0.0;
+  late double _elevation = 0.0;
 
   @override
   void initState() {
@@ -66,6 +67,10 @@ class _SmoothTopBar2State extends State<SmoothTopBar2> {
         ),
       );
     }
+
+    if (!widget.elevationOnScroll) {
+      _elevation = widget.elevation;
+    }
   }
 
   void _onScroll() {
@@ -77,7 +82,14 @@ class _SmoothTopBar2State extends State<SmoothTopBar2> {
     );
 
     if (newProgress != _progress) {
-      setState(() => _progress = newProgress);
+      setState(() {
+        if (widget.elevationOnScroll) {
+          _elevation = widget.elevation * newProgress;
+        }
+        if (widget.reducedHeightOnScroll) {
+          _progress = newProgress;
+        }
+      });
     }
   }
 
@@ -99,7 +111,7 @@ class _SmoothTopBar2State extends State<SmoothTopBar2> {
 
     return PhysicalModel(
       color: Colors.transparent,
-      elevation: _computeElevation(),
+      elevation: _elevation,
       shadowColor: widget.elevationColor ??
           (darkTheme ? Colors.white10 : Colors.black12),
       borderRadius: borderRadius,
@@ -182,13 +194,6 @@ class _SmoothTopBar2State extends State<SmoothTopBar2> {
     );
   }
 
-  double _computeElevation() {
-    if (!widget.elevationOnScroll) {
-      return widget.elevation;
-    }
-    return widget.elevation * _progress;
-  }
-
   double _computeHeight() =>
       kToolbarHeight +
       ((SmoothTopBar2.kTopBar2Height - kToolbarHeight) * (1 - _progress));