display(iOS): support locking zoom

utmapp · Aug 3, 2022 · 4355723 · 4355723
1 parent 23209fe
commit 4355723
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Platform/iOS/Display/VMDisplayMetalViewController.m b/Platform/iOS/Display/VMDisplayMetalViewController.m
@@ -40,6 +40,7 @@ - (instancetype)initWithDisplay:(CSDisplay *)display input:(CSInput *)input {
     if (self = [super initWithNibName:nil bundle:nil]) {
         self.vmDisplay = display;
         self.vmInput = input;
+        [self addObserver:self forKeyPath:@"vmDisplay.displaySize" options:NSKeyValueObservingOptionNew context:nil];
     }
     return self;
 }
@@ -200,4 +201,10 @@ - (void)setDisplayScaling:(CGFloat)scaling origin:(CGPoint)origin {
     }
 }
 
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
+    if ([keyPath isEqualToString:@"vmDisplay.displaySize"]) {
+        [self.delegate display:self.vmDisplay didResizeTo:self.vmDisplay.displaySize];
+    }
+}
+
 @end
diff --git a/Platform/iOS/Display/VMDisplayViewControllerDelegate.swift b/Platform/iOS/Display/VMDisplayViewControllerDelegate.swift
@@ -30,6 +30,7 @@ import Foundation
 
     func displayDidAssertUserInteraction()
     func displayDidAppear()
+    func display(_ display: CSDisplay, didResizeTo size: CGSize)
     func serialDidError(_ error: String)
     func requestInputTablet(_ tablet: Bool)
 }
diff --git a/Platform/iOS/VMDisplayHostedView.swift b/Platform/iOS/VMDisplayHostedView.swift
@@ -116,6 +116,12 @@ struct VMDisplayHostedView: UIViewControllerRepresentable {
             }
         }
 
+        func display(_ display: CSDisplay, didResizeTo size: CGSize) {
+            if state.isDisplayZoomLocked {
+                state.resizeDisplayToFit(display, size: size)
+            }
+        }
+
         func serialDidError(_ error: String) {
             state.alert = .nonfatalError(error)
         }

diff --git a/Platform/iOS/VMWindowState.swift b/Platform/iOS/VMWindowState.swift
@@ -62,6 +62,8 @@ struct VMWindowState: Identifiable {
 
     var displayViewSize: CGSize = .zero
 
+    var isDisplayZoomLocked: Bool = false
+
     var isKeyboardRequested: Bool = false
 
     var isKeyboardShown: Bool = false
@@ -114,9 +116,9 @@ extension VMWindowState {
         "stty cols $COLS rows $ROWS\\n"
     }
 
-    private mutating func resizeDisplayToFit(_ display: CSDisplay) {
+    mutating func resizeDisplayToFit(_ display: CSDisplay, size: CGSize = .zero) {
         let viewSize = displayViewSize
-        let displaySize = display.displaySize
+        let displaySize = size == .zero ? display.displaySize : size
         let scaled = CGSize(width: viewSize.width / displaySize.width, height: viewSize.height / displaySize.height)
         let viewportScale = min(scaled.width, scaled.height)
         display.viewportScale = viewportScale
@@ -148,13 +150,16 @@ extension VMWindowState {
     mutating func toggleDisplayResize(command: String? = nil) {
         if case let .display(display, _) = device {
             if isViewportChanged {
+                isDisplayZoomLocked = false
                 resetDisplay(display)
             } else {
+                isDisplayZoomLocked = true
                 resizeDisplayToFit(display)
             }
         } else if case let .serial(serial, _) = device {
             resetConsole(serial)
             isViewportChanged = false
+            isDisplayZoomLocked = false
         }
     }
 }