small fixes

pull/1011/head
Gabby Gurdin 2 years ago
parent dc7029be97
commit d9dcb0a562

@ -143,8 +143,10 @@ class Message extends StatelessWidget {
// #Pangea
final PangeaMessageEvent? pangeaMessageEvent =
controller.getPangeaMessageEvent(event.eventId);
final ToolbarDisplayController? toolbarController =
controller.getToolbarDisplayController(event.eventId);
ToolbarDisplayController? toolbarController;
if (event.messageType == MessageTypes.Text) {
toolbarController = controller.getToolbarDisplayController(event.eventId);
}
// Pangea#
final resetAnimateIn = this.resetAnimateIn;

@ -24,6 +24,7 @@ class ToolbarDisplayController {
final String targetId;
final bool immersionMode;
final ChatController controller;
final FocusNode focusNode = FocusNode();
MessageToolbar? toolbar;
String? overlayId;
@ -54,8 +55,7 @@ class ToolbarDisplayController {
if (controller.selectMode) {
controller.clearSelectedEvents();
}
// focusNode.unfocus();
FocusScope.of(context).unfocus();
focusNode.requestFocus();
final LayerLinkAndKey layerLinkAndKey =
MatrixState.pAnyState.layerLinkAndKey(targetId);

@ -121,7 +121,12 @@ class WordDataCardController extends State<WordDataCard> {
}
Future<void> getWordNet() async {
if (mounted) setState(() => isLoadingWordNet = true);
if (mounted) {
setState(() {
wordData = null;
isLoadingWordNet = true;
});
}
try {
wordData = await controller.wordNet.getWordDataGlobal(
word: widget.word,
@ -137,9 +142,7 @@ class WordDataCardController extends State<WordDataCard> {
);
wordNetError = err;
} finally {
if (mounted) {
setState(() => isLoadingWordNet = false);
}
if (mounted) setState(() => isLoadingWordNet = false);
}
}

Loading…
Cancel
Save