ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make underlines match the exact width of the text they're hiding (#1034)

Browse source
This commit is contained in:
ggurdin 2024-11-18 15:11:15 -05:00 • committed by GitHub
parent d0733cf8fa
commit f66697330e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
lib/pangea/widgets/chat/message_token_text.dart
View file

@ -102,14 +102,34 @@ class MessageTokenText extends StatelessWidget {
.toString();
if (tokenPosition.token != null) {
if (tokenPosition.hideContent) {
final TextPainter textPainter = TextPainter(
text: TextSpan(text: substring, style: _style),
textDirection: TextDirection.ltr,
)..layout();
final textWidth = textPainter.size.width;
return WidgetSpan(
child: GestureDetector(
onTap: () => _onClick != null && tokenPosition.token != null
? _onClick!(tokenPosition.token!)
: null,
child: Container(
width: textWidth,
height: 1,
color: _style.color,
margin: const EdgeInsets.only(bottom: 2),
),
),
);
}
return TextSpan(
recognizer: TapGestureRecognizer()
..onTap = () => _onClick != null && tokenPosition.token != null
? _onClick!(tokenPosition.token!)
: null,
text: !tokenPosition.hideContent
? substring
: '_' * substring.length,
text: substring,
style: _style.merge(
TextStyle(
backgroundColor: tokenPosition.highlight
@ -121,12 +141,32 @@ class MessageTokenText extends StatelessWidget {
),
);
} else {
if ((i > 0 || i < tokenPositions.length - 1) &&
tokenPositions[i + 1].hideContent &&
tokenPositions[i - 1].hideContent) {
final TextPainter textPainter = TextPainter(
text: TextSpan(text: substring, style: _style),
textDirection: TextDirection.ltr,
)..layout();
final textWidth = textPainter.size.width;
return WidgetSpan(
child: GestureDetector(
onTap: () => _onClick != null && tokenPosition.token != null
? _onClick!(tokenPosition.token!)
: null,
child: Container(
width: textWidth,
height: 1,
color: _style.color,
margin: const EdgeInsets.only(bottom: 2),
),
),
);
}
return TextSpan(
text: (i > 0 || i < tokenPositions.length - 1) &&
tokenPositions[i + 1].hideContent &&
tokenPositions[i - 1].hideContent
? '_' * substring.length
: substring,
text: substring,
style: _style,
);
}