Merge branch 'stable' into dev

# Conflicts: # CHANGELOG.md # example/lib/main.dart # example/lib/pages/buttons_page.dart # example/lib/pages/colors_page.dart # example/lib/pages/dialogs_page.dart # example/lib/pages/fields_page.dart # example/lib/pages/indicators_page.dart # example/lib/pages/toolbar_page.dart # example/pubspec.lock # lib/macos_ui.dart # lib/src/fields/text_field.dart # lib/src/indicators/scrollbar.dart # lib/src/layout/content_area.dart # lib/src/layout/window.dart # lib/src/selectors/date_picker.dart # pubspec.lock # pubspec.yaml # test/buttons/help_button_test.dart # test/buttons/icon_button_test.dart # test/buttons/pulldown_button_test.dart # test/buttons/push_button_test.dart # test/buttons/radio_button_test.dart # test/buttons/segmented_control_test.dart # test/layout/macos_list_tile_test.dart # test/layout/resizeable_pane_test.dart # test/selectors/date_picker_test.dart
macosui · Feb 13, 2023 · 17982c8 · 17982c8
2 parents e08ac84 + 02cd183
commit 17982c8
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 27 deletions.
diff --git a/example/lib/pages/indicators_page.dart b/example/lib/pages/indicators_page.dart
@@ -39,15 +39,15 @@ class _IndicatorsPageState extends State<IndicatorsPage> {
               child: Column(
                 children: [
                   CapacityIndicator(
-                    value: sliderValue,
-                    onChanged: (v) => setState(() => sliderValue = v),
+                    value: capacitorValue,
+                    onChanged: (v) => setState(() => capacitorValue = v),
                     splits: 20,
                     discrete: true,
                   ),
                   const SizedBox(height: 20),
                   CapacityIndicator(
-                    value: sliderValue,
-                    onChanged: (v) => setState(() => sliderValue = v),
+                    value: capacitorValue,
+                    onChanged: (v) => setState(() => capacitorValue = v),
                   ),
                   const SizedBox(height: 20),
                   MacosSlider(

diff --git a/example/lib/pages/selectors_page.dart b/example/lib/pages/selectors_page.dart
@@ -30,6 +30,7 @@ class _SelectorsPageState extends State<SelectorsPage> {
         ContentArea(
           builder: (context, scrollController) {
             return SingleChildScrollView(
+              controller: scrollController,
               padding: const EdgeInsets.all(20),
               child: Column(
                 children: [

diff --git a/example/lib/pages/tabview_page.dart b/example/lib/pages/tabview_page.dart
@@ -22,7 +22,7 @@ class _TabViewPageState extends State<TabViewPage> {
       ),
       children: [
         ContentArea(
-          builder: (context, scrollController) {
+          builder: (context, _) {
             return Padding(
               padding: const EdgeInsets.all(24.0),
               child: MacosTabView(

diff --git a/test/buttons/checkbox_test.dart b/test/buttons/checkbox_test.dart
@@ -12,7 +12,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   return StatefulBuilder(
                     builder: (context, setState) {
                       return MacosCheckbox(

diff --git a/test/buttons/help_button_test.dart b/test/buttons/help_button_test.dart
@@ -24,7 +24,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     return HelpButton(
                       onPressed: mockOnPressedFunction.handler,
                     );

diff --git a/test/buttons/icon_button_test.dart b/test/buttons/icon_button_test.dart
@@ -19,7 +19,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   return MacosIconButton(
                     icon: const Icon(CupertinoIcons.add),
                     onPressed: mockOnPressedFunction.handler,

diff --git a/test/buttons/popup_button_test.dart b/test/buttons/popup_button_test.dart
@@ -17,7 +17,7 @@ void main() {
               child: MacosScaffold(
                 children: [
                   ContentArea(
-                    builder: (context, scrollController) {
+                    builder: (context, _) {
                       return StatefulBuilder(
                         builder: (context, setState) {
                           return MacosPopupButton<String>(

diff --git a/test/buttons/pulldown_button_test.dart b/test/buttons/pulldown_button_test.dart
@@ -22,7 +22,7 @@ void main() {
               child: MacosScaffold(
                 children: [
                   ContentArea(
-                    builder: (context, scrollController) {
+                    builder: (context, _) {
                       return Center(
                         child: MacosPulldownButton(
                           title: "test",

diff --git a/test/buttons/push_button_test.dart b/test/buttons/push_button_test.dart
@@ -25,7 +25,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     return PushButton(
                       buttonSize: ButtonSize.small,
                       onPressed: mockOnPressedFunction.handler,

diff --git a/test/buttons/radio_button_test.dart b/test/buttons/radio_button_test.dart
@@ -20,7 +20,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   return Center(
                     child: MacosRadioButton<TestOptions>(
                       value: TestOptions.first,

diff --git a/test/buttons/segmented_control_test.dart b/test/buttons/segmented_control_test.dart
@@ -14,7 +14,7 @@ void main() {
               child: MacosScaffold(
                 children: [
                   ContentArea(
-                    builder: (context, scrollController) {
+                    builder: (context, _) {
                       return Center(
                         child: MacosSegmentedControl(
                           controller: controller,

diff --git a/test/buttons/switch_test.dart b/test/buttons/switch_test.dart
@@ -12,7 +12,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   return Center(
                     child: MacosSwitch(
                       value: selected,

diff --git a/test/fields/search_field_test.dart b/test/fields/search_field_test.dart
@@ -29,7 +29,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     return Center(
                       child: SizedBox(
                         width: 300.0,

diff --git a/test/fields/text_field_test.dart b/test/fields/text_field_test.dart
@@ -12,7 +12,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   return Center(
                     child: MacosTextField(
                       controller: controller,

diff --git a/test/layout/macos_list_tile_test.dart b/test/layout/macos_list_tile_test.dart
@@ -23,7 +23,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   return MacosListTile(
                     title: const Text('List Tile'),
                     onClick: mockOnPressedFunction.handler,

diff --git a/test/layout/tab_view_test.dart b/test/layout/tab_view_test.dart
@@ -14,7 +14,7 @@ void main() {
               child: MacosScaffold(
                 children: [
                   ContentArea(
-                    builder: (context, scrollController) {
+                    builder: (context, _) {
                       return Padding(
                         padding: const EdgeInsets.all(24.0),
                         child: MacosTabView(

diff --git a/test/selectors/date_picker_test.dart b/test/selectors/date_picker_test.dart
@@ -15,7 +15,7 @@ void main() {
               child: MacosScaffold(
                 children: [
                   ContentArea(
-                    builder: (context, scrollController) {
+                    builder: (context, _) {
                       return Center(
                         child: MacosDatePicker(
                           onDateChanged: (date) {},
@@ -262,7 +262,7 @@ void main() {
               child: MacosScaffold(
                 children: [
                   ContentArea(
-                    builder: (context, scrollController) {
+                    builder: (context, _) {
                       return Center(
                         child: MacosDatePicker(
                           onDateChanged: (date) {

diff --git a/test/theme/help_button_theme_test.dart b/test/theme/help_button_theme_test.dart
@@ -59,7 +59,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     capturedContext = context;
                     return const HelpButton();
                   },

diff --git a/test/theme/icon_button_theme_test.dart b/test/theme/icon_button_theme_test.dart
@@ -66,7 +66,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   capturedContext = context;
                   return MacosIconButton(
                     icon: const Icon(CupertinoIcons.add),

diff --git a/test/theme/icon_theme_test.dart b/test/theme/icon_theme_test.dart
@@ -66,7 +66,7 @@ void main() {
           child: MacosScaffold(
             children: [
               ContentArea(
-                builder: (context, scrollController) {
+                builder: (context, _) {
                   capturedContext = context;
                   return const MacosIcon(
                     CupertinoIcons.add,

diff --git a/test/theme/popup_button_theme_test.dart b/test/theme/popup_button_theme_test.dart
@@ -70,7 +70,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     capturedContext = context;
                     return MacosPopupButton<String>(
                       value: popupValue,

diff --git a/test/theme/pulldown_button_theme_test.dart b/test/theme/pulldown_button_theme_test.dart
@@ -69,7 +69,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     capturedContext = context;
                     return const Center(
                       child: MacosPulldownButton(

diff --git a/test/theme/push_button_theme_test.dart b/test/theme/push_button_theme_test.dart
@@ -61,7 +61,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     capturedContext = context;
                     return const PushButton(
                       buttonSize: ButtonSize.small,

diff --git a/test/theme/search_field_theme_test.dart b/test/theme/search_field_theme_test.dart
@@ -65,7 +65,7 @@ void main() {
             child: MacosScaffold(
               children: [
                 ContentArea(
-                  builder: (context, scrollController) {
+                  builder: (context, _) {
                     capturedContext = context;
                     return const Center(
                       child: MacosSearchField(),