From 6b9afcfb7c9c17dee8bc6e7ff91c19da8184ce36 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Tue, 3 Oct 2023 09:07:55 -0400
Subject: [PATCH] MacPDF: Create window UI in code instead of in xib

No intentional behavior change.
---
 Meta/Lagom/Contrib/MacPDF/CMakeLists.txt      |  1 -
 Meta/Lagom/Contrib/MacPDF/MacPDFDocument.mm   |  1 +
 Meta/Lagom/Contrib/MacPDF/MacPDFDocument.xib  | 32 -------------------
 .../Contrib/MacPDF/MacPDFWindowController.mm  | 19 ++++++-----
 4 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 Meta/Lagom/Contrib/MacPDF/MacPDFDocument.xib

diff --git a/Meta/Lagom/Contrib/MacPDF/CMakeLists.txt b/Meta/Lagom/Contrib/MacPDF/CMakeLists.txt
index b5695ae6fa..8b3ea1bab4 100644
--- a/Meta/Lagom/Contrib/MacPDF/CMakeLists.txt
+++ b/Meta/Lagom/Contrib/MacPDF/CMakeLists.txt
@@ -10,7 +10,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 add_compile_options(-DAK_DONT_REPLACE_STD)
 
 set(RESOURCES
-    MacPDFDocument.xib
     MainMenu.xib
 )
 
diff --git a/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.mm b/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.mm
index fa685404ca..bc8ab778d0 100644
--- a/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.mm
+++ b/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.mm
@@ -81,6 +81,7 @@
 {
     _windowController = [[MacPDFWindowController alloc] initWithDocument:self];
     [self addWindowController:_windowController];
+    [self windowIsReady];
 }
 
 - (void)windowIsReady
diff --git a/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.xib b/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.xib
deleted file mode 100644
index c2768cbc8f..0000000000
--- a/Meta/Lagom/Contrib/MacPDF/MacPDFDocument.xib
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MacPDFWindowController">
-            <connections>
-                <outlet property="_pdfView" destination="gIp-Ho-8D9" id="bcT-vU-foe"/>
-                <outlet property="window" destination="xOd-HO-29H" id="JIz-fz-R2o"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="xOd-HO-29H" userLabel="Window">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="133" y="235" width="600" height="800"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1728" height="1079"/>
-            <value key="minSize" type="size" width="94" height="86"/>
-            <view key="contentView" id="gIp-Ho-8D9" customClass="MacPDFView">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="800"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </view>
-            <connections>
-                <outlet property="delegate" destination="-2" id="0bl-1N-x8E"/>
-            </connections>
-            <point key="canvasLocation" x="139.5" y="430"/>
-        </window>
-    </objects>
-</document>
diff --git a/Meta/Lagom/Contrib/MacPDF/MacPDFWindowController.mm b/Meta/Lagom/Contrib/MacPDF/MacPDFWindowController.mm
index e22d8c5183..21ddf43193 100644
--- a/Meta/Lagom/Contrib/MacPDF/MacPDFWindowController.mm
+++ b/Meta/Lagom/Contrib/MacPDF/MacPDFWindowController.mm
@@ -19,20 +19,23 @@
 
 - (instancetype)initWithDocument:(MacPDFDocument*)document
 {
-    if (self = [super initWithWindowNibName:@"MacPDFDocument" owner:self]; !self)
+    auto const style_mask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable;
+    NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 600, 800)
+                                                   styleMask:style_mask
+                                                     backing:NSBackingStoreBuffered
+                                                       defer:YES];
+
+    if (self = [super initWithWindow:window]; !self)
         return nil;
 
+    _pdfView = [[MacPDFView alloc] initWithFrame:NSZeroRect];
+    window.contentView = _pdfView;
+    [_pdfView setDelegate:self];
+
     _pdfDocument = document;
     return self;
 }
 
-- (void)windowDidLoad
-{
-    [super windowDidLoad];
-    [_pdfView setDelegate:self];
-    [_pdfDocument windowIsReady];
-}
-
 - (void)pdfDidInitialize
 {
     [_pdfView setDocument:_pdfDocument.pdf->make_weak_ptr()];