Unverified Commit fc7ce3ee authored by Shi-Hao Hong's avatar Shi-Hao Hong Committed by GitHub

Step 3: Removes temporary flag for SnackBarBehavior.floating offset fix (#55064)

* Remove SnackBar floating flag, making the offset fix the only behavior

* Remove rest of code that contians references to Scaffold.shouldSnackBarIgnoreFABRect
parent f0a4eab7
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// TODO(shihaohong): remove ignoring deprecated member use analysis
// when Scaffold.shouldSnackBarIgnoreFABRect parameter is removed.
// ignore_for_file: deprecated_member_use_from_same_package
import 'dart:async'; import 'dart:async';
import 'dart:collection'; import 'dart:collection';
import 'dart:math' as math; import 'dart:math' as math;
...@@ -556,15 +552,10 @@ class _ScaffoldLayout extends MultiChildLayoutDelegate { ...@@ -556,15 +552,10 @@ class _ScaffoldLayout extends MultiChildLayoutDelegate {
} }
double snackBarYOffsetBase; double snackBarYOffsetBase;
if (Scaffold.shouldSnackBarIgnoreFABRect) { if (floatingActionButtonRect.size != Size.zero && isSnackBarFloating) {
if (floatingActionButtonRect.size != Size.zero && isSnackBarFloating)
snackBarYOffsetBase = floatingActionButtonRect.top; snackBarYOffsetBase = floatingActionButtonRect.top;
else
snackBarYOffsetBase = contentBottom;
} else { } else {
snackBarYOffsetBase = floatingActionButtonRect != null && isSnackBarFloating snackBarYOffsetBase = contentBottom;
? floatingActionButtonRect.top
: contentBottom;
} }
positionChild(_ScaffoldSlot.snackBar, Offset(0.0, snackBarYOffsetBase - snackBarSize.height)); positionChild(_ScaffoldSlot.snackBar, Offset(0.0, snackBarYOffsetBase - snackBarSize.height));
...@@ -1334,17 +1325,6 @@ class Scaffold extends StatefulWidget { ...@@ -1334,17 +1325,6 @@ class Scaffold extends StatefulWidget {
/// By default, the drag gesture is enabled. /// By default, the drag gesture is enabled.
final bool endDrawerEnableOpenDragGesture; final bool endDrawerEnableOpenDragGesture;
/// This flag is deprecated and fixes and issue with incorrect clipping
/// and positioning of the [SnackBar] set to [SnackBarBehavior.floating].
@Deprecated(
'This property controls whether to clip and position the snackbar as '
'if there is always a floating action button, even if one is not present. '
'It exists to provide backwards compatibility to ease migrations, and will '
'eventually be removed. '
'This feature was deprecated after v1.15.3.'
)
static bool shouldSnackBarIgnoreFABRect = true;
/// The state from the closest instance of this class that encloses the given context. /// The state from the closest instance of this class that encloses the given context.
/// ///
/// {@tool dartpad --template=freeform} /// {@tool dartpad --template=freeform}
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// TODO(shihaohong): remove ignoring deprecated member use analysis
// when Scaffold.shouldSnackBarIgnoreFABRect parameter is removed.
// ignore_for_file: deprecated_member_use_from_same_package
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment