Enable scrollbars (#735)

* fix typo * x * x
flutter · Jul 13, 2022 · 89c9492 · 89c9492
1 parent 9212aec
commit 89c9492
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -1431,7 +1431,7 @@
   "@demoCupertinoScrollbarTitle": {
     "description": "Title for the cupertino scrollbar demo."
   },
-  "demoCupertinoScrollbarSubtitle": "iOS style scrollbar",
+  "demoCupertinoScrollbarSubtitle": "iOS-style scrollbar",
   "@demoCupertinoScrollbarSubtitle": {
     "description": "Subtitle for the cupertino scrollbar demo."
   },

diff --git a/lib/l10n/intl_en_US.xml b/lib/l10n/intl_en_US.xml
@@ -1324,7 +1324,7 @@
   <string
     name="demoCupertinoScrollbarSubtitle"
     description="Subtitle for the cupertino scrollbar demo."
-    >iOS style scrollbar</string>
+    >iOS-style scrollbar</string>
   <string
     name="demoCupertinoScrollbarDescription"
     description="Description for the cupertino scrollbar demo."

diff --git a/lib/main.dart b/lib/main.dart
@@ -48,12 +48,6 @@ class GalleryApp extends StatelessWidget {
         builder: (context) {
           final options = GalleryOptions.of(context);
           return MaterialApp(
-            // By default on desktop, scrollbars are applied by the
-            // ScrollBehavior. This overrides that. All vertical scrollables in
-            // the gallery need to be audited before enabling this feature,
-            // see https://github.com/flutter/gallery/issues/523
-            scrollBehavior:
-                const MaterialScrollBehavior().copyWith(scrollbars: false),
             restorationScopeId: 'rootGallery',
             title: 'Flutter Gallery',
             debugShowCheckedModeBanner: false,

diff --git a/lib/pages/home.dart b/lib/pages/home.dart
@@ -532,6 +532,7 @@ class _DesktopCategoryItem extends StatelessWidget {
                 child: ListView.builder(
                   // Makes integration tests possible.
                   key: ValueKey('${category.name}DemoList'),
+                  primary: false,
                   itemBuilder: (context, index) =>
                       CategoryDemoItem(demo: demos[index]),
                   itemCount: demos.length,
@@ -907,6 +908,7 @@ class _DesktopCarouselState extends State<_DesktopCarousel> {
               ),
               child: ListView.builder(
                 scrollDirection: Axis.horizontal,
+                primary: false,
                 physics: const _SnappingScrollPhysics(),
                 controller: _controller,
                 itemExtent: itemWidth,