From f9078d6d5f84abbfa4844910654234db101a459d Mon Sep 17 00:00:00 2001 From: Nindi Gill Date: Thu, 1 Jun 2023 17:19:07 +1000 Subject: [PATCH] Fix annoying window resizing bug --- Mist.xcodeproj/project.pbxproj | 4 ++++ Mist/Extensions/Scene+Extension.swift | 19 +++++++++++++++++++ Mist/MistApp.swift | 1 + 3 files changed, 24 insertions(+) create mode 100644 Mist/Extensions/Scene+Extension.swift diff --git a/Mist.xcodeproj/project.pbxproj b/Mist.xcodeproj/project.pbxproj index 2753535..499ece9 100644 --- a/Mist.xcodeproj/project.pbxproj +++ b/Mist.xcodeproj/project.pbxproj @@ -133,6 +133,7 @@ 573A235E2A285E8900EC9470 /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 573A235D2A285E8900EC9470 /* SQLite */; }; 573A23602A285EAE00EC9470 /* FullDiskAccessVerifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573A235F2A285EAE00EC9470 /* FullDiskAccessVerifier.swift */; }; 573A23622A28711C00EC9470 /* Architecture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573A23612A28711C00EC9470 /* Architecture.swift */; }; + 573A23642A28791F00EC9470 /* Scene+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573A23632A28791F00EC9470 /* Scene+Extension.swift */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -275,6 +276,7 @@ 39FF05F9285985DD00A86670 /* SettingsAboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsAboutView.swift; sourceTree = ""; }; 573A235F2A285EAE00EC9470 /* FullDiskAccessVerifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullDiskAccessVerifier.swift; sourceTree = ""; }; 573A23612A28711C00EC9470 /* Architecture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Architecture.swift; sourceTree = ""; }; + 573A23632A28791F00EC9470 /* Scene+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Scene+Extension.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -355,6 +357,7 @@ 390451DB28573F1000E0B563 /* Dictionary+Extension.swift */, 3935F47F286551FB00760AB0 /* Double+Extension.swift */, 39252AB6285C718C00956C74 /* FileManager+Extension.swift */, + 573A23632A28791F00EC9470 /* Scene+Extension.swift */, 390451E0285740E800E0B563 /* Sequence+Extension.swift */, 390451BE2856E34700E0B563 /* String+Extension.swift */, 398734CF28603D9E00B4C357 /* UInt8+Extension.swift */, @@ -851,6 +854,7 @@ 395DCD16287FE36E00C411CE /* DownloadAlertType.swift in Sources */, 39CF560028619147006FB5D2 /* HelperToolCommandType.swift in Sources */, 39252A87285ACE9C00956C74 /* FooterText.swift in Sources */, + 573A23642A28791F00EC9470 /* Scene+Extension.swift in Sources */, 3935F48E2869278200760AB0 /* InstallerExportType.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Mist/Extensions/Scene+Extension.swift b/Mist/Extensions/Scene+Extension.swift new file mode 100644 index 0000000..333068c --- /dev/null +++ b/Mist/Extensions/Scene+Extension.swift @@ -0,0 +1,19 @@ +// +// Scene+Extension.swift +// Mist +// +// Created by Nindi Gill on 1/6/2023. +// + +import SwiftUI + +extension Scene { + + func fixedWindow() -> some Scene { + if #available(macOS 13.0, *) { + return self.windowResizability(.contentSize) + } else { + return self + } + } +} diff --git a/Mist/MistApp.swift b/Mist/MistApp.swift index b8098a1..edacd10 100644 --- a/Mist/MistApp.swift +++ b/Mist/MistApp.swift @@ -23,6 +23,7 @@ struct MistApp: App { hideZoomButton() } } + .fixedWindow() .commands { AppCommands(sparkleUpdater: sparkleUpdater, refreshing: $refreshing, downloadInProgress: $downloadInProgress) }