From ffaa516dcd980335beb0f3be6bed44d6f33f511b Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 4 Oct 2026 00:32:20 -0400 Subject: [PATCH] always make event previews two lines for non-state events --- lib/widgets/event_preview.dart | 22 +++++++--------- lib/widgets/renderers/message.dart | 41 +++++++++++++----------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/lib/widgets/event_preview.dart b/lib/widgets/event_preview.dart index d15c8ab..50be18c 100644 --- a/lib/widgets/event_preview.dart +++ b/lib/widgets/event_preview.dart @@ -18,20 +18,16 @@ class const EventPreview(final Event event, {super.key}) if (event.content is MessageContent) MessageAvatar(event), Flexible( - child: Row( - crossAxisAlignment: .center, - mainAxisSize: .min, - spacing: 8, + child: Column( + mainAxisAlignment: .center, + crossAxisAlignment: .start, children: [ - if (event.content is MessageContent) - Flexible(child: MessageDisplayname(event)), - Flexible( - child: EventRenderer( - event.rowId, - roomId: event.roomId, - textOnly: true, - maxLines: 1, - ), + if (event.content is MessageContent) MessageDisplayname(event), + EventRenderer( + event.rowId, + roomId: event.roomId, + textOnly: true, + maxLines: 1, ), ], ), diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart index b2dda31..566d7b3 100644 --- a/lib/widgets/renderers/message.dart +++ b/lib/widgets/renderers/message.dart @@ -199,30 +199,25 @@ class const MessageRenderer( child: Padding( padding: .symmetric(vertical: 8, horizontal: 12), child: SizedBox( - height: 32, - child: OverflowBox( - alignment: .centerLeft, - minHeight: 0, - maxHeight: .infinity, - child: switch (ref.watch( - EventController.provider( - .new( - roomId: event.roomId, - eventId: event.replyTo!, - ), + height: 48, + child: switch (ref.watch( + EventController.provider( + .new( + roomId: event.roomId, + eventId: event.replyTo!, ), - )) { - AsyncData(:final value?) || - AsyncLoading( - :final value?, - ) => EventPreview(value), - AsyncError _ => Text( - "An error occurred while fetching the reply", - style: errorStyle, - ), - _ => Loading(dimension: 12), - }, - ), + ), + )) { + AsyncData(:final value?) || + AsyncLoading( + :final value?, + ) => EventPreview(value), + AsyncError _ => Text( + "An error occurred while fetching the reply", + style: errorStyle, + ), + _ => Loading(dimension: 12), + }, ), ), ),