From 684a9bd16e2dbf231b87568df10b83fad28119eb Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 17 Jun 2025 10:49:32 -0400 Subject: [PATCH] chore: make text size match for matrix pill widget --- lib/pages/chat/events/html_message.dart | 10 ++++++++-- lib/pangea/toolbar/utils/token_rendering_util.dart | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index d7af1008f..ddfa041b3 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -407,7 +407,10 @@ class HtmlMessage extends StatelessWidget { avatar: user.avatarUrl, uri: href, outerContext: context, - fontSize: fontSize, + // #Pangea + // fontSize: fontSize, + fontSize: renderer.fontSize(context), + // Pangea# color: linkStyle.color, // #Pangea userId: user.id, @@ -428,7 +431,10 @@ class HtmlMessage extends StatelessWidget { avatar: room?.avatar, uri: href, outerContext: context, - fontSize: fontSize, + // #Pangea + // fontSize: fontSize, + fontSize: renderer.fontSize(context), + // Pangea# color: linkStyle.color, ), ); diff --git a/lib/pangea/toolbar/utils/token_rendering_util.dart b/lib/pangea/toolbar/utils/token_rendering_util.dart index d6d2cc27f..8efbeeedc 100644 --- a/lib/pangea/toolbar/utils/token_rendering_util.dart +++ b/lib/pangea/toolbar/utils/token_rendering_util.dart @@ -27,7 +27,7 @@ class TokenRenderingUtil { return readingAssistanceMode == ReadingAssistanceMode.transitionMode; } - double? _fontSize(BuildContext context) => showCenterStyling + double? fontSize(BuildContext context) => showCenterStyling ? overlayController != null && overlayController!.maxWidth > 600 ? Theme.of(context).textTheme.titleLarge?.fontSize : Theme.of(context).textTheme.bodyLarge?.fontSize @@ -38,14 +38,14 @@ class TokenRenderingUtil { Color? color, }) => existingStyle.copyWith( - fontSize: _fontSize(context), + fontSize: fontSize(context), decoration: TextDecoration.underline, decorationThickness: 4, decorationColor: color ?? Colors.white.withAlpha(0), ); double tokenTextWidthForContainer(BuildContext context, String text) { - final tokenSizeKey = "$text-${_fontSize(context)}"; + final tokenSizeKey = "$text-${fontSize(context)}"; if (_tokensWidthCache.containsKey(tokenSizeKey)) { return _tokensWidthCache[tokenSizeKey]!; }