Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6733 from vector-im/doug/6708-fix-composer-jumping

Browse source 
Only disable the composer if the room is yet to be created.
This commit is contained in:
Stefan Ceriu 2022-09-19 13:08:36 +03:00 committed by GitHub
commit a5804a3025
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Generated/Strings.swift
View file

@ -187,7 +187,7 @@ public class VectorL10n: NSObject {
public static var allChatsEmptySpaceInformation: String {
return VectorL10n.tr("Vector", "all_chats_empty_space_information")
}
/// This is where you're unread messages will show up, when you have some.
/// This is where your unread messages will show up, when you have some.
public static var allChatsEmptyUnreadsPlaceholderMessage: String {
return VectorL10n.tr("Vector", "all_chats_empty_unreads_placeholder_message")
}

8
Riot/Modules/Room/RoomViewController.m
View file

@ -1544,10 +1544,6 @@ static CGSize kThreadListBarButtonItemImageSize;
*/
- (void)createDiscussionIfNeeded:(void (^)(BOOL readyToSend))onComplete
{
// Disable the input tool bar during this operation. This prevents us from creating several discussions, or
// trying to send several invites.
self.inputToolbarView.userInteractionEnabled = false;
void(^completion)(BOOL) = ^(BOOL readyToSend) {
self.inputToolbarView.userInteractionEnabled = true;
if (onComplete) {
@ -1557,6 +1553,10 @@ static CGSize kThreadListBarButtonItemImageSize;
if (self.directChatTargetUser)
{
// Disable the input tool bar during this operation. This prevents us from creating several discussions, or
// trying to send several invites.
self.inputToolbarView.userInteractionEnabled = false;
[self createDiscussionWithUser:self.directChatTargetUser completion:completion];
}
else

1
changelog.d/6708.bugfix Normal file
View file

@ -0,0 +1 @@
Message Composer: Stop the keyboard jumping after sending a message on certain devices.