Merge pull request #680 from pangeachat/handle-header-overflow

fixed height of toolbar
pangeachat · Sep 13, 2024 · d0bc47d · d0bc47d
2 parents 82c95e4 + 0984df4
commit d0bc47d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
@@ -22,7 +22,7 @@ abstract class AppConfig {
   static const double messageFontSize = 16.0;
   static const bool allowOtherHomeservers = true;
   static const bool enableRegistration = true;
-  static const double toolbarMaxHeight = 315.0;
+  static const double toolbarMaxHeight = 300.0;
   // #Pangea
   // static const Color primaryColor = Color(0xFF5625BA);
   // static const Color primaryColorLight = Color(0xFFCCBDEA);

diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pangea/enum/message_mode_enum.dart';
@@ -239,7 +240,12 @@ class MessageToolbarState extends State<MessageToolbar> {
           .key,
       type: MaterialType.transparency,
       child: Container(
-        padding: const EdgeInsets.all(10),
+        constraints: const BoxConstraints(
+          maxHeight: AppConfig.toolbarMaxHeight,
+          maxWidth: 275,
+          minWidth: 275,
+        ),
+        padding: const EdgeInsets.fromLTRB(20, 20, 20, 10),
         decoration: BoxDecoration(
           color: Theme.of(context).cardColor,
           border: Border.all(
@@ -254,13 +260,7 @@ class MessageToolbarState extends State<MessageToolbar> {
           mainAxisSize: MainAxisSize.min,
           children: [
             if (toolbarContent != null)
-              Container(
-                padding: const EdgeInsets.fromLTRB(8, 8, 8, 16),
-                constraints: const BoxConstraints(
-                  maxWidth: 275,
-                  minWidth: 275,
-                  maxHeight: 250,
-                ),
+              Flexible(
                 child: SingleChildScrollView(
                   child: AnimatedSize(
                     duration: FluffyThemes.animationDuration,