don't use future builder when not ensureScreenSize (#517)

OpenFlutter · Nov 1, 2023 · b780eb7 · b780eb7
1 parent 03a575f
commit b780eb7
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/lib/src/screenutil_init.dart b/lib/src/screenutil_init.dart
@@ -73,7 +73,7 @@ class ScreenUtilInit extends StatefulWidget {
     this.splitScreenMode = false,
     this.minTextAdapt = false,
     this.useInheritedMediaQuery = false,
-    this.ensureScreenSize,
+    this.ensureScreenSize = false,
     this.responsiveWidgets,
     this.fontSizeResolver = FontSizeResolvers.width,
   }) : super(key: key);
@@ -83,7 +83,7 @@ class ScreenUtilInit extends StatefulWidget {
   final bool splitScreenMode;
   final bool minTextAdapt;
   final bool useInheritedMediaQuery;
-  final bool? ensureScreenSize;
+  final bool ensureScreenSize;
   final RebuildFactor rebuildFactor;
   final FontSizeResolver fontSizeResolver;
 
@@ -133,7 +133,7 @@ class _ScreenUtilInitState extends State<ScreenUtilInit>
   }
 
   Future<void> _validateSize() async {
-    if (widget.ensureScreenSize ?? false) return ScreenUtil.ensureScreenSize();
+    if (widget.ensureScreenSize) return ScreenUtil.ensureScreenSize();
   }
 
   void _markNeedsBuildIfAllowed(Element el) {
@@ -171,6 +171,18 @@ class _ScreenUtilInitState extends State<ScreenUtilInit>
 
     if (mq == null) return const SizedBox.shrink();
 
+    if (!widget.ensureScreenSize) {
+      ScreenUtil.configure(
+        data: mq,
+        designSize: widget.designSize,
+        splitScreenMode: widget.splitScreenMode,
+        minTextAdapt: widget.minTextAdapt,
+        fontSizeResolver: widget.fontSizeResolver,
+      );
+
+      return widget.builder?.call(context, widget.child) ?? widget.child!;
+    }
+
     return FutureBuilder<void>(
       future: _screenSizeCompleter.future,
       builder: (c, snapshot) {