fixed fixed size image

twocanoes · Feb 29, 2024 · f1a2e72 · f1a2e72
1 parent d6a1b17
commit f1a2e72
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 34 deletions.
diff --git a/XCreds/MainLoginWindowController.swift b/XCreds/MainLoginWindowController.swift
@@ -103,14 +103,6 @@ class MainLoginWindowController: NSWindowController,NSWindowDelegate {
 
         let backgroundImage = DefaultsHelper.backgroundImage()
         TCSLogWithMark()
-        if let backgroundImage = backgroundImage {
-            backgroundImage.size=screenRect.size
-            self.backgroundImageView.image=backgroundImage
-            self.backgroundImageView.imageScaling = .scaleProportionallyUpOrDown
-
-            self.backgroundImageView.frame=NSMakeRect(screenRect.origin.x, screenRect.origin.y, screenRect.size.width, screenRect.size.height-100)
-
-        }
         self.window?.level = .normal
 
         if self.controlsViewController==nil {
@@ -180,27 +172,37 @@ class MainLoginWindowController: NSWindowController,NSWindowDelegate {
     }
 
     fileprivate func createBackground() {
+        TCSLogWithMark()
+
         let backgroundImage = DefaultsHelper.backgroundImage()
         let screenRect = NSScreen.screens[0].frame
-        TCSLogWithMark()
+        var newHeight = screenRect.height
+        var newWidth = screenRect.width
+
         if let backgroundImage = backgroundImage {
-            TCSLogWithMark()
-            backgroundImageView.image?.size=screenRect.size
-            TCSLogWithMark()
 
-            backgroundImageView.image=backgroundImage
-            TCSLogWithMark()
+            if UserDefaults.standard.bool(forKey: PrefKeys.shouldLoginWindowBackgroundImageFillScreen.rawValue) == false {
+                let ratio = backgroundImage.size.width/backgroundImage.size.height
+                newHeight = screenRect.size.height
+                newWidth = screenRect.size.height * ratio
+
+                if newWidth > screenRect.size.width {
+                    newWidth = screenRect.size.width
+                    newHeight = screenRect.size.width / ratio
+                }
+
+            }
+
 
-            backgroundImage.size=screenRect.size
-            TCSLogWithMark()
+
+            backgroundImage.size.height = newHeight
+            backgroundImage.size.width = newWidth
+            backgroundImageView.image=backgroundImage
 
             backgroundImageView.imageScaling = .scaleProportionallyUpOrDown
-            TCSLogWithMark()
             backgroundImageView.frame=NSMakeRect(screenRect.origin.x, screenRect.origin.y, screenRect.size.width, screenRect.size.height-100)
-            TCSLogWithMark()
 
         }
-        TCSLogWithMark()
 
     }
     func recenterCenterView()  {

diff --git a/XCreds/PreferencesWindow.xib b/XCreds/PreferencesWindow.xib
@@ -18,7 +18,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="560" y="551" width="494" height="173"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="3440" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1496" height="910"/>
             <view key="contentView" wantsLayer="YES" id="ZbF-tC-vpZ">
                 <rect key="frame" x="0.0" y="0.0" width="494" height="173"/>
                 <autoresizingMask key="autoresizingMask"/>

diff --git a/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift b/XCredsLoginPlugIn/LoginWindow/SignInWindowController.swift
@@ -142,12 +142,6 @@ protocol UpdateCredentialsFeedbackProtocol {
 
         self.view.wantsLayer=true
         self.view.layer?.backgroundColor = CGColor(red: 0.3, green: 0.3, blue: 0.3, alpha: 0.4)
-
-        if UserDefaults.standard.bool(forKey: PrefKeys.shouldLoginWindowBackgroundImageFillScreen.rawValue) == true {
-
-            self.view.layer?.contentsGravity = CALayerContentsGravity.resizeAspectFill
-        }
-
         localOnlyCheckBox.isEnabled=true
         localOnlyView.isHidden=false
         // make things look better

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1440,7 +1440,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6374;
+				CURRENT_PROJECT_VERSION = 6399;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1477,7 +1477,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6374;
+				CURRENT_PROJECT_VERSION = 6399;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1598,7 +1598,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6374;
+				CURRENT_PROJECT_VERSION = 6399;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1635,7 +1635,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6374;
+				CURRENT_PROJECT_VERSION = 6399;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1785,7 +1785,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6374;
+				CURRENT_PROJECT_VERSION = 6399;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1827,7 +1827,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6374;
+				CURRENT_PROJECT_VERSION = 6399;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcschemes/xcschememanagement.plist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -32,7 +32,7 @@
 		<key>auth_mech_fixup.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>6</integer>
 		</dict>
 		<key>authrights.xcscheme_^#shared#^_</key>
 		<dict>
@@ -42,7 +42,7 @@
 		<key>test.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>