RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

MacPDF: Save and restore current page

Browse source 
This works great when quitting and reopening the app,
but when closing a window and the reopening from Recent Files,
the current page isn't restored. In Preview.app, it is.
This commit is contained in:
Nico Weber 2023-09-21 22:26:49 -04:00 • committed by Andreas Kling
parent 5401f3aecc
commit 2799dedb1b
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meta/Lagom/Contrib/MacPDF/LagomPDFView.mm
View file

@ -62,8 +62,12 @@ static NSBitmapImageRep* ns_from_gfx(NonnullRefPtr<Gfx::Bitmap> bitmap_p)
- (void)setDocument:(WeakPtr<PDF::Document>)doc - (void)setDocument:(WeakPtr<PDF::Document>)doc
{ {
NSLog(@"doc set");
_doc = move(doc); _doc = move(doc);
_page_index = min(24 - 1, _doc->get_page_count() - 1); _page_index = 0;
// FIXME: We do this again in restoreStateWithCoder:, which is wasteful.
// Compute bitmap lazily.
[self pageChanged]; [self pageChanged];
} }
@ -71,7 +75,6 @@ static NSBitmapImageRep* ns_from_gfx(NonnullRefPtr<Gfx::Bitmap> bitmap_p)
{ {
if (!_doc || _doc->get_page_count() == 0) if (!_doc || _doc->get_page_count() == 0)
return; return;
[self invalidateRestorableState];
NSSize pixel_size = [self convertSizeToBacking:self.bounds.size]; NSSize pixel_size = [self convertSizeToBacking:self.bounds.size];
if (auto bitmap_or = render(*_doc, _page_index, pixel_size); !bitmap_or.is_error()) if (auto bitmap_or = render(*_doc, _page_index, pixel_size); !bitmap_or.is_error())
_rep = ns_from_gfx(bitmap_or.value()); _rep = ns_from_gfx(bitmap_or.value());
@ -98,6 +101,7 @@ static NSBitmapImageRep* ns_from_gfx(NonnullRefPtr<Gfx::Bitmap> bitmap_p)
{ {
if (_page_index > 0) { if (_page_index > 0) {
_page_index--; _page_index--;
[self invalidateRestorableState];
[self pageChanged]; [self pageChanged];
[self setNeedsDisplay:YES]; [self setNeedsDisplay:YES];
} }
@ -107,6 +111,7 @@ static NSBitmapImageRep* ns_from_gfx(NonnullRefPtr<Gfx::Bitmap> bitmap_p)
{ {
if (_page_index < _doc->get_page_count() - 1) { if (_page_index < _doc->get_page_count() - 1) {
_page_index++; _page_index++;
[self invalidateRestorableState];
[self pageChanged]; [self pageChanged];
[self setNeedsDisplay:YES]; [self setNeedsDisplay:YES];
} }
@ -114,11 +119,18 @@ static NSBitmapImageRep* ns_from_gfx(NonnullRefPtr<Gfx::Bitmap> bitmap_p)
- (void)encodeRestorableStateWithCoder:(NSCoder*)coder - (void)encodeRestorableStateWithCoder:(NSCoder*)coder
{ {
NSLog(@"FIXME encodeRestorableStateWithCoder"); [coder encodeInt:_page_index forKey:@"PageIndex"];
NSLog(@"encodeRestorableStateWithCoder encoded %d", _page_index);
} }
- (void)restoreStateWithCoder:(NSCoder*)coder - (void)restoreStateWithCoder:(NSCoder*)coder
{ {
NSLog(@"FIXME restoreStateWithCoder"); if ([coder containsValueForKey:@"PageIndex"]) {
int page_index = [coder decodeIntForKey:@"PageIndex"];
_page_index = min(max(0, page_index), _doc->get_page_count() - 1);
NSLog(@"encodeRestorableStateWithCoder restored %d", _page_index);
[self pageChanged];
[self setNeedsDisplay:YES];
}
} }
@end @end