fix: macos back button in toolbar, text field label spacing

KRTirtho · Nov 12, 2022 · af9485b · af9485b
1 parent d01042e
commit af9485b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/lib/src/platform_back_button.dart b/lib/src/platform_back_button.dart
@@ -55,9 +55,14 @@ class PlatformBackButton extends StatelessWidget with PlatformMixin<Widget> {
 
   @override
   Widget macos(BuildContext context) {
-    return MacosBackButton(
-      fillColor: color,
-      onPressed: onPressed,
+    return Container(
+      height: 30,
+      width: 30,
+      margin: const EdgeInsets.symmetric(vertical: 10),
+      child: MacosBackButton(
+        fillColor: color,
+        onPressed: onPressed,
+      ),
     );
   }
 

diff --git a/lib/src/platform_text_field.dart b/lib/src/platform_text_field.dart
@@ -391,6 +391,7 @@ class _PlatformTextFieldState extends FluentUI.State<PlatformTextField>
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         if (widget.label != null) Text(widget.label!, style: widget.labelStyle),
+        SizedBox(height: widget.label != null ? 8.0 : 0.0),
         textField,
       ],
     );
@@ -513,6 +514,7 @@ class _PlatformTextFieldState extends FluentUI.State<PlatformTextField>
                       ?.copyWith(fontWeight: FontWeight.w500),
             ),
           ),
+          SizedBox(height: widget.label != null ? 8.0 : 0.0),
           textField,
         ],
       );

diff --git a/lib/src/platform_theme.dart b/lib/src/platform_theme.dart
@@ -126,7 +126,7 @@ class PlatformThemeData {
           linux: androidTheme.textTheme.headline3,
           ios: iosTheme.textTheme.navLargeTitleTextStyle,
           macos: macosTheme.typography.largeTitle,
-          windows: windowsTheme?.typography.titleLarge,
+          windows: windowsTheme?.typography.title,
         ).resolve(currentPlatform),
         caption: PlatformProperty(
           android: androidTheme.textTheme.caption,
@@ -147,7 +147,8 @@ class PlatformThemeData {
           linux: androidTheme.textTheme.headline4,
           ios: iosTheme.textTheme.navTitleTextStyle,
           macos: macosTheme.typography.title1,
-          windows: windowsTheme?.typography.title,
+          windows: windowsTheme?.typography.bodyLarge
+              ?.copyWith(fontWeight: FontWeight.bold),
         ).resolve(currentPlatform),
       ),
       borderColor: PlatformProperty(

diff --git a/lib/src/platform_window_buttons.dart b/lib/src/platform_window_buttons.dart
@@ -145,6 +145,7 @@ class _PlatformWindowButtonsState extends State<PlatformWindowButtons>
           buttonType: WindowButtonType.close,
           onPressed: widget.onClose ?? config?.onClose,
         ),
+        const SizedBox(width: 4),
       ],
     );
   }
@@ -257,7 +258,7 @@ class _PlatformWindowButtonsState extends State<PlatformWindowButtons>
               : widget.onMaximize ?? config?.onMaximize,
           child: isMaximized(context)
               ? RestoreIcon(color: PlatformTextTheme.of(context).body!.color!)
-              : CloseIcon(color: PlatformTextTheme.of(context).body!.color!),
+              : MaximizeIcon(color: PlatformTextTheme.of(context).body!.color!),
         ),
         FluentUI.Button(
           style: buttonStyle.copyWith(