From d11ae197f319074b0d2f7f55efaca968e03419b6 Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Thu, 29 Sep 2022 21:09:40 +0800
Subject: [PATCH] CustomAlertDialog default BoxConstraints

---
 flutter/lib/common.dart            | 9 +++++----
 flutter/lib/models/file_model.dart | 4 ++++
 flutter/lib/models/model.dart      | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 1ec401461..1b3aad9d8 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -561,6 +561,7 @@ class CustomAlertDialog extends StatelessWidget {
       required this.content,
       this.actions,
       this.contentPadding,
+      this.contentBoxConstraints = const BoxConstraints(maxWidth: 500),
       this.onSubmit,
       this.onCancel})
       : super(key: key);
@@ -569,6 +570,7 @@ class CustomAlertDialog extends StatelessWidget {
   final Widget content;
   final List<Widget>? actions;
   final double? contentPadding;
+  final BoxConstraints contentBoxConstraints;
   final Function()? onSubmit;
   final Function()? onCancel;
 
@@ -600,7 +602,8 @@ class CustomAlertDialog extends StatelessWidget {
         title: title,
         contentPadding: EdgeInsets.symmetric(
             horizontal: contentPadding ?? 25, vertical: 10),
-        content: content,
+        content:
+            ConstrainedBox(constraints: contentBoxConstraints, child: content),
         actions: actions,
       ),
     );
@@ -645,9 +648,7 @@ void msgBox(
   }
   dialogManager.show((setState, close) => CustomAlertDialog(
         title: _msgBoxTitle(title),
-        content: ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: 500),
-            child: Text(translate(text), style: const TextStyle(fontSize: 15))),
+        content: Text(translate(text), style: const TextStyle(fontSize: 15)),
         actions: buttons,
         onSubmit: hasOk ? submit : null,
         onCancel: hasCancel == true ? cancel : null,
diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart
index 3246346be..3fdbe7099 100644
--- a/flutter/lib/models/file_model.dart
+++ b/flutter/lib/models/file_model.dart
@@ -570,6 +570,8 @@ class FileModel extends ChangeNotifier {
             Text(title)
           ],
         ),
+        contentBoxConstraints:
+            BoxConstraints(minHeight: 100, minWidth: 400, maxWidth: 400),
         content: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             mainAxisSize: MainAxisSize.min,
@@ -627,6 +629,8 @@ class FileModel extends ChangeNotifier {
             Text(title)
           ],
         ),
+        contentBoxConstraints:
+            BoxConstraints(minHeight: 100, minWidth: 400, maxWidth: 400),
         content: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             mainAxisSize: MainAxisSize.min,
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index dfb81f64a..255ecb6d6 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -268,6 +268,7 @@ class FfiModel with ChangeNotifier {
     if (isPeerAndroid) {
       _touchMode = true;
       if (parent.target != null &&
+          parent.target!.connType == ConnType.defaultConn &&
           parent.target!.ffiModel.permissions['keyboard'] != false) {
         Timer(
             const Duration(milliseconds: 100),