Tweak pagination/room switching behaviour

neilalexander · Sep 12, 2018 · 9dda375 · 9dda375
1 parent bc1f80b
commit 9dda375
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/Seaglass/Controller/Main View/MainViewRoomController.swift b/Seaglass/Controller/Main View/MainViewRoomController.swift
@@ -378,20 +378,22 @@ class MainViewRoomController: NSViewController, MatrixRoomDelegate, NSTableViewD
                 })
             }
 
-            if let room = MatrixServices.inst.session.room(withRoomId: cacheEntry.roomId) {
-                if cache.filteredContent.count < 50 {
+            if cache.filteredContent.count >= 50 {
+                roomDidPaginate()
+            } else {
+                if let room = MatrixServices.inst.session.room(withRoomId: cacheEntry.roomId) {
                     room.liveTimeline.resetPagination()
-                }
-                let group = DispatchGroup()
-                while cache.filteredContent.count == 0 {
-                    group.enter()
-                    room.liveTimeline.paginate(25, direction: .backwards, onlyFromStore: false) { _ in
-                        if cache.filteredContent.count >= 50 {
-                            roomDidPaginate()
+                    let group = DispatchGroup()
+                    while cache.filteredContent.count < 50 {
+                        group.enter()
+                        room.liveTimeline.paginate(25, direction: .backwards, onlyFromStore: false) { _ in
+                            if cache.filteredContent.count >= 50 {
+                                roomDidPaginate()
+                            }
+                            group.leave()
                         }
-                        group.leave()
+                        group.wait()
                     }
-                    group.wait()
                 }
             }
         }

diff --git a/Seaglass/Subclass/Image Views/InlineImageView.swift b/Seaglass/Subclass/Image Views/InlineImageView.swift
@@ -53,7 +53,7 @@ class InlineImageView: ContextImageView, QLPreviewItem, QLPreviewPanelDelegate,
         guard let mxcURL = forMxcUrl else { return }
 
         if mxcURL.hasPrefix("mxc://") {
-            guard let url = MatrixServices.inst.client.url(ofContentThumbnail: forMxcUrl, toFitViewSize: CGSize(width: 96, height: 96), with: MXThumbnailingMethodScale) else { return }
+            guard let url = MatrixServices.inst.client.url(ofContentThumbnail: forMxcUrl, toFitViewSize: CGSize(width: 256, height: 256), with: MXThumbnailingMethodScale) else { return }
             guard let realurl = MatrixServices.inst.client.url(ofContent: forMxcUrl) else { return }
 
             if url.hasPrefix("http://") || url.hasPrefix("https://") {