remember window sizing

Author: lambdan

imageviewer5.xcodeproj/project.pbxproj

@@ -319,7 +319,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = djs.imageviewer5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -342,7 +342,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = djs.imageviewer5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

imageviewer5.xcodeproj/project.xcworkspace/xcuserdata/djs.xcuserdatad/UserInterfaceState.xcuserstate

@@ -110,9 +110,11 @@ func spawn_window() {
 
     // Create the window and set the content view.
     window = NSWindow(
-        contentRect: NSRect(x: 0, y: 0, width: 480, height: 300),
+        contentRect: NSRect(),
         styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
         backing: .buffered, defer: false)
+    
+    //contentView.frame(minWidth: CGFloat(current_image_width), minHeight:CGFloat(current_image_height))
     window.title = WindowTitle
     window.center()
     window.setFrameAutosaveName("Main Window")
@@ -170,6 +172,16 @@ func get_URL_String() -> String { /* file://path/to/picture.jpg */
     return current_url
 }
 
+func get_IMG_Size(axis: String) -> Int {
+    if axis == "Width" {
+        return current_image_width
+    }
+    if axis == "Height" {
+        return current_image_height
+    }
+    return 0
+}
+
 func get_full_filepath() -> String { /* /path/to/picture.jpg */
     let fp = String ( ((NSURL(string: get_URL_String())?.path)!))
     return fp

imageviewer5/AppDelegate.swift

@@ -3,14 +3,14 @@ import AppKit
 import Combine
 import Foundation
 
-var screen_width = NSScreen.main?.frame.width
-var screen_height = NSScreen.main?.frame.height
-
+var screen_width = NSScreen.main?.frame.width // Current display max width
+var screen_height = NSScreen.main?.frame.height // and height
 
 struct ContentView: View {
     @State var url_string = get_URL_String()
-    //@State var window_width = (screen_width)! / 2 // get macs screen resolution
-    //@State var window_height = (screen_height)! / 2
+    @State var imgW = CGFloat(get_IMG_Size(axis: "Width"))
+    @State var imgH = CGFloat(get_IMG_Size(axis: "Height"))
+    
 
     let pub = NotificationCenter.default.publisher(for: NSNotification.Name(NCName))
 
@@ -26,13 +26,17 @@ struct ContentView: View {
             }.onReceive(pub) {_ in
             // This gets run when notification is sent
             self.url_string = get_URL_String()
+            self.imgW = CGFloat(get_IMG_Size(axis: "Width"))
+            self.imgH = CGFloat(get_IMG_Size(axis: "Height"))
+            
         }
+        .frame(minWidth: 400, idealWidth: imgW, maxWidth: NSScreen.main?.frame.height, minHeight: 300, idealHeight: imgH, maxHeight: NSScreen.main?.frame.height)
     }
 }
-
+/*
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         ContentView()
     }
-}
+}*/
 

imageviewer5/ContentView.swift

@@ -36,7 +36,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>37</string>
+	<string>104</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.photography</string>
 	<key>LSMinimumSystemVersion</key>