Merge branch 'master' into develop

This commit is contained in:
Stefan Ceriu
2022-02-16 12:45:06 +02:00
10 changed files with 60 additions and 19 deletions
@@ -47,6 +47,13 @@ typedef enum : NSUInteger
*/
- (void)roomInputToolbarViewDidChangeTextMessage:(MXKRoomInputToolbarView*)toolbarView;
/**
Inform the delegate that the action menu was opened.
@param toolbarView the room input toolbar view
*/
- (void)roomInputToolbarViewDidOpenActionMenu:(MXKRoomInputToolbarView*)toolbarView;
@end
/**
@@ -429,6 +429,7 @@ static const NSTimeInterval kActionMenuComposerHeightAnimationDuration = .3;
if (_actionMenuOpened) {
self.actionsBar.hidden = NO;
[self.actionsBar animateWithShowIn:_actionMenuOpened completion:nil];
[self.delegate roomInputToolbarViewDidOpenActionMenu:self];
}
else
{