Fix size of media on iPad when multitasking.

element-hq · Jun 24, 2022 · 730eafc · 730eafc
1 parent 177d77b
commit 730eafc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/...ontrollers/MXKAttachmentsViewController.h → ...tachements/MXKAttachmentsViewController.h b/...ontrollers/MXKAttachmentsViewController.h → ...tachements/MXKAttachmentsViewController.h
diff --git a/...ontrollers/MXKAttachmentsViewController.m → ...tachements/MXKAttachmentsViewController.m b/...ontrollers/MXKAttachmentsViewController.m → ...tachements/MXKAttachmentsViewController.m
@@ -38,6 +38,8 @@
 
 #import "MXKSwiftHeader.h"
 
+#import "LegacyAppDelegate.h"
+
 @interface MXKAttachmentsViewController () <UINavigationControllerDelegate, UIViewControllerTransitioningDelegate>
 {
     /**
@@ -472,7 +474,9 @@ - (void)refreshCurrentVisibleItemIndex
     // Check whether the collection is actually rendered
     if (_attachmentsCollection.contentSize.width)
     {
-        currentVisibleItemIndex = _attachmentsCollection.contentOffset.x / [[UIScreen mainScreen] bounds].size.width;
+        // Get the window from the app delegate as this can be called before the view is presented.
+        UIWindow *window = LegacyAppDelegate.theDelegate.window;
+        currentVisibleItemIndex = _attachmentsCollection.contentOffset.x / window.bounds.size.width;
     }
     else
     {
@@ -484,9 +488,12 @@ - (void)refreshAttachmentCollectionContentOffset
 {
     if (currentVisibleItemIndex != NSNotFound && _attachmentsCollection)
     {
+        // Get the window from the app delegate as this can be called before the view is presented.
+        UIWindow *window = LegacyAppDelegate.theDelegate.window;
+
         // Set the content offset to display the current attachment
         CGPoint contentOffset = _attachmentsCollection.contentOffset;
-        contentOffset.x = currentVisibleItemIndex * [[UIScreen mainScreen] bounds].size.width;
+        contentOffset.x = currentVisibleItemIndex * window.bounds.size.width;
         _attachmentsCollection.contentOffset = contentOffset;
     }
 }
@@ -1118,7 +1125,8 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    return [[UIScreen mainScreen] bounds].size;
+    // Use the window from the app delegate as this can be called before the view is presented.
+    return LegacyAppDelegate.theDelegate.window.bounds.size;
 }
 
 #pragma mark - Movie Player

diff --git a/...trollers/MXKAttachmentsViewController.xib → ...chements/MXKAttachmentsViewController.xib b/...trollers/MXKAttachmentsViewController.xib → ...chements/MXKAttachmentsViewController.xib
diff --git a/changelog.d/pr-6339.bugfix b/changelog.d/pr-6339.bugfix
@@ -0,0 +1 @@
+Media: Fix size issues when opening media on an iPad whilst multi-tasking.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Media: Fix size issues when opening media on an iPad whilst multi-tasking.