Merge branch 'braid/emoji-placeholder' into 'main'

fix: custom emote placeholder

See merge request famedly/fluffychat!1127
This commit is contained in:
Krille 2023-06-03 16:05:59 +00:00
commit 36cc2c23a1
2 changed files with 11 additions and 5 deletions

View file

@ -263,6 +263,8 @@ class InputBar extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
MxcImage( MxcImage(
// ensure proper ordering ...
key: ValueKey(suggestion['name']),
uri: suggestion['mxc'] is String uri: suggestion['mxc'] is String
? Uri.parse(suggestion['mxc'] ?? '') ? Uri.parse(suggestion['mxc'] ?? '')
: null, : null,

View file

@ -212,16 +212,20 @@ class EmotesSettingsView extends StatelessWidget {
class _EmoteImage extends StatelessWidget { class _EmoteImage extends StatelessWidget {
final Uri mxc; final Uri mxc;
const _EmoteImage(this.mxc); const _EmoteImage(this.mxc);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
const size = 38.0; const size = 38.0;
return MxcImage( return SizedBox.square(
uri: mxc, dimension: size,
fit: BoxFit.contain, child: MxcImage(
width: size, uri: mxc,
height: size, fit: BoxFit.contain,
width: size,
height: size,
),
); );
} }
} }