Skip to content

Commit 6860a8b

Browse files
committed
msglist: Fix star icon alignment issue.
By aligning the row using `textBaseline`, we no longer need to apply the padding to the star. Fixes #616. Signed-off-by: Zixuan James Li <[email protected]>
1 parent 70bd3ab commit 6860a8b

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

lib/widgets/message_list.dart

+17-19
Original file line numberDiff line numberDiff line change
@@ -962,25 +962,23 @@ class MessageWithPossibleSender extends StatelessWidget {
962962
if (senderRow != null)
963963
Padding(padding: const EdgeInsets.fromLTRB(16, 2, 16, 0),
964964
child: senderRow),
965-
Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
966-
const SizedBox(width: 16),
967-
Expanded(
968-
child: Column(
969-
crossAxisAlignment: CrossAxisAlignment.stretch,
970-
children: [
971-
MessageContent(message: message, content: item.content),
972-
if ((message.reactions?.total ?? 0) > 0)
973-
ReactionChipsList(messageId: message.id, reactions: message.reactions!)
974-
])),
975-
SizedBox(width: 16,
976-
child: message.flags.contains(MessageFlag.starred)
977-
// TODO(#157): fix how star marker aligns with message content
978-
// Design from Figma at:
979-
// https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=813%3A28817&mode=dev .
980-
? Padding(padding: const EdgeInsets.only(top: 4),
981-
child: Icon(ZulipIcons.star_filled, size: 16, color: designVariables.star))
982-
: null),
983-
]),
965+
Row(crossAxisAlignment: CrossAxisAlignment.baseline,
966+
textBaseline: localizedTextBaseline(context),
967+
children: [
968+
const SizedBox(width: 16),
969+
Expanded(
970+
child: Column(
971+
crossAxisAlignment: CrossAxisAlignment.stretch,
972+
children: [
973+
MessageContent(message: message, content: item.content),
974+
if ((message.reactions?.total ?? 0) > 0)
975+
ReactionChipsList(messageId: message.id, reactions: message.reactions!)
976+
])),
977+
SizedBox(width: 16,
978+
child: message.flags.contains(MessageFlag.starred)
979+
? Icon(ZulipIcons.star_filled, size: 16, color: designVariables.star)
980+
: null),
981+
]),
984982
])));
985983
}
986984
}

0 commit comments

Comments
 (0)