fix all base64 inconsistent framing

macadmins · Jan 3, 2024 · df4dbfd · df4dbfd
1 parent f4ca968
commit df4dbfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Nudge/UI/Common/CompanyLogo.swift b/Nudge/UI/Common/CompanyLogo.swift
@@ -47,6 +47,7 @@ struct CompanyLogo: View {
                                 .resizable()
                                 .aspectRatio(contentMode: .fit)
                                 .scaledToFit()
+                                .frame(width: logoWidth, height: logoHeight)
                         )
                     } else {
                         Image(systemName: "applelogo")

diff --git a/Nudge/UI/StandardMode/RightSide.swift b/Nudge/UI/StandardMode/RightSide.swift
@@ -103,9 +103,9 @@ struct StandardModeRightSide: View {
                         } label: {
                             Image(nsImage: Utils().createImageBase64(base64String: screenShotPath))
                                 .resizable()
-                                .aspectRatio(contentMode: .fit)
                                 .scaledToFit()
-                                .frame(width: logoWidth, height: logoHeight)
+                                .aspectRatio(contentMode: .fit)
+                                .frame(maxHeight: screenshotMaxHeight)
                         }
                         .buttonStyle(.plain)
                         .help(screenShotAltText.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)))

diff --git a/Nudge/UI/StandardMode/ScreenShotZoom.swift b/Nudge/UI/StandardMode/ScreenShotZoom.swift
@@ -52,8 +52,8 @@ struct ScreenShotZoom: View {
                     if screenShotPath.starts(with: "data:") {
                         Image(nsImage: Utils().createImageBase64(base64String: screenShotPath))
                             .resizable()
-                            .aspectRatio(contentMode: .fit)
                             .scaledToFit()
+                            .aspectRatio(contentMode: .fit)
                             .frame(maxHeight: 675)
                     } else {
                         if FileManager.default.fileExists(atPath: screenShotPath) {