Try fix window resize problem

pull/1384/head
Kelrap 1 year ago
parent e7fa9a35f1
commit 6c5f4d0ece

@ -1,6 +1,7 @@
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat/sticker_picker_dialog.dart'; import 'package:fluffychat/pages/chat/sticker_picker_dialog.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
@ -97,7 +98,7 @@ class ChatEmojiPicker extends StatelessWidget {
EmojiPickerType.reaction) EmojiPickerType.reaction)
? 14.0 ? 14.0
: 0, : 0,
top: 2.0, top: PlatformInfos.isWeb ? 4 : 2.0,
), ),
child: FloatingActionButton( child: FloatingActionButton(
onPressed: () => onPressed: () =>

@ -68,7 +68,11 @@ class OverlayUtil {
position == OverlayEnum.centered) position == OverlayEnum.centered)
? 0 ? 0
: null, : null,
left: (position == OverlayEnum.bottom) ? 0 : null, left: (position == OverlayEnum.bottom)
? 0
: (position == OverlayEnum.centered)
? 0
: null,
bottom: (position == OverlayEnum.bottom || bottom: (position == OverlayEnum.bottom ||
position == OverlayEnum.centered) position == OverlayEnum.centered)
? 0 ? 0

@ -2,6 +2,7 @@ import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart';
import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:fluffychat/pangea/widgets/chat/message_toolbar.dart'; import 'package:fluffychat/pangea/widgets/chat/message_toolbar.dart';
import 'package:fluffychat/pangea/widgets/chat/overlay_footer.dart'; import 'package:fluffychat/pangea/widgets/chat/overlay_footer.dart';
import 'package:fluffychat/pangea/widgets/chat/overlay_header.dart'; import 'package:fluffychat/pangea/widgets/chat/overlay_header.dart';
@ -56,18 +57,21 @@ class MessageSelectionOverlay extends StatelessWidget {
final double stackSize = final double stackSize =
MediaQuery.of(context).size.height - footerSize - headerSize; MediaQuery.of(context).size.height - footerSize - headerSize;
try {
if (targetRenderBox != null) { if (targetRenderBox != null) {
final Size transformTargetSize = (targetRenderBox as RenderBox).size; final Size transformTargetSize = (targetRenderBox as RenderBox).size;
final Offset targetOffset = (targetRenderBox).localToGlobal(Offset.zero); final Offset targetOffset =
(targetRenderBox).localToGlobal(Offset.zero);
if (ownMessage) { if (ownMessage) {
right = MediaQuery.of(context).size.width - right = MediaQuery.of(context).size.width -
targetOffset.dx - targetOffset.dx -
transformTargetSize.width; transformTargetSize.width;
} else { } else {
left = targetOffset.dx - (FluffyThemes.isColumnMode(context) ? 425 : 1); left =
targetOffset.dx - (FluffyThemes.isColumnMode(context) ? 425 : 1);
} }
showDown = targetOffset.dy + transformTargetSize.height <= showDown = targetOffset.dy + transformTargetSize.height / 2 <=
headerSize + stackSize / 2; headerSize + stackSize / 2;
center = targetOffset.dy - center = targetOffset.dy -
@ -91,7 +95,7 @@ class MessageSelectionOverlay extends StatelessWidget {
} }
// If message is not too long, but too close // If message is not too long, but too close
// to center of screen, scroll closer to edges // to center of screen, scroll closer to edges
if (targetOffset.dy + transformTargetSize.height > midpoint - 30 && else if (targetOffset.dy + transformTargetSize.height > midpoint - 30 &&
targetOffset.dy < midpoint + 30) { targetOffset.dy < midpoint + 30) {
final double scrollUp = midpoint + 30 - targetOffset.dy; final double scrollUp = midpoint + 30 - targetOffset.dy;
final double scrollDown = final double scrollDown =
@ -131,6 +135,12 @@ class MessageSelectionOverlay extends StatelessWidget {
} }
} }
} }
} catch (err) {
MatrixState.pAnyState.closeAllOverlays();
ErrorHandler.logError(e: err, s: StackTrace.current);
// throw L10n.of(context)!.toolbarError;
return const SizedBox();
}
final Widget overlayMessage = OverlayMessage( final Widget overlayMessage = OverlayMessage(
pangeaMessageEvent.event, pangeaMessageEvent.event,
@ -142,11 +152,7 @@ class MessageSelectionOverlay extends StatelessWidget {
showDown: showDown, showDown: showDown,
); );
return Container( return Expanded(
constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width -
(FluffyThemes.isColumnMode(context) ? 425 : 0),
),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,

@ -81,7 +81,7 @@ class ToolbarDisplayController {
// not to open immediately after clicking (user has to scroll or move their cursor) // not to open immediately after clicking (user has to scroll or move their cursor)
// so I'm commenting it out for now // so I'm commenting it out for now
// WidgetsBinding.instance.addPostFrameCallback((timeStamp) { // WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Widget overlayEntry; Widget? overlayEntry;
if (toolbar == null) return; if (toolbar == null) return;
try { try {
overlayEntry = MessageSelectionOverlay( overlayEntry = MessageSelectionOverlay(
@ -338,7 +338,7 @@ class MessageToolbarState extends State<MessageToolbar> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final double maxHeight = (MediaQuery.of(context).size.height - final double maxHeight = (MediaQuery.of(context).size.height -
(PlatformInfos.isWeb (PlatformInfos.isWeb
? 214 ? 217
: PlatformInfos.isIOS : PlatformInfos.isIOS
? 262 ? 262
: 198)) / : 198)) /

Loading…
Cancel
Save