felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 16:13:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.6.7' into hotfix/1.6.7_2

Browse Source
This commit is contained in:
SBiOSoftWhare
2021-11-03 17:22:21 +01:00
parent 43f1ea73c5 41c43c9fb9
commit b2934662b7
13 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+6 -9
View File
@@ -1098,16 +1098,12 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
if (self.roomDataSource)
{
// Restore tool bar view and room activities view if none
if (!self.inputToolbarView)
{
[self updateRoomInputToolbarViewClassIfNeeded];
[self refreshRoomInputToolbar];
self.inputToolbarView.hidden = (self.roomDataSource.state != MXKDataSourceStateReady);
}
// Update the input toolbar class and update the layout
[self updateRoomInputToolbarViewClassIfNeeded];
self.inputToolbarView.hidden = (self.roomDataSource.state != MXKDataSourceStateReady);
// Restore room activities view if none
if (!self.activitiesView)
{
// And the extra area
@@ -1192,6 +1188,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
}
[self updateInputToolBarViewHeight];
[self refreshRoomInputToolbar];
}
}