Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix crash and adapt parallels (macOS >= 14) (支持macOS 14以上版本, 解决崩溃问题, 兼容虚拟机parallels) #684

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@

# [5.1.0]

- 新增匀速平滑以适配 `parallels` 虚拟机精细滚动. (原来的滚动太长了)

# [5.0.0]

- 支持 MacOS 14, 解决平滑滚动时崩溃问题

# [2.2.0](https://github.com/Caldis/Mos/releases/tag/2.2.0)

真帅
Expand Down Expand Up @@ -356,4 +365,4 @@ SmoothScroll performance improved.

---

First version released !
First version released !
36 changes: 21 additions & 15 deletions Mos.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -18,7 +18,6 @@
0B6D3B6A2041C348004CC064 /* ScrollEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B6D3B692041C348004CC064 /* ScrollEvent.swift */; };
0B6D3B702042BBCD004CC064 /* Localizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B6D3B6F2042BBCD004CC064 /* Localizable.swift */; };
0B74C441205E386D00E3F942 /* Interceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B74C440205E386D00E3F942 /* Interceptor.swift */; };
0B99C5FC2577FC9200021578 /* ScrollPoster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B99C5FB2577FC9200021578 /* ScrollPoster.swift */; };
0BB0F1BE20F3A04F00909B7D /* WelcomeWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB0F1BD20F3A04F00909B7D /* WelcomeWindowController.swift */; };
0BB0F1C020F3A05D00909B7D /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB0F1BF20F3A05D00909B7D /* WelcomeViewController.swift */; };
0BC2AD2F20F3BA090084416B /* PreferencesContributorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC2AD2E20F3BA090084416B /* PreferencesContributorsViewController.swift */; };
Expand Down Expand Up @@ -55,6 +54,7 @@
23BB4D3121D775D4009B51E9 /* EventMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23BB4D3021D775D4009B51E9 /* EventMonitor.swift */; };
23E3C96D21DCE8F10098B107 /* StatusItemPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23E3C96C21DCE8F10098B107 /* StatusItemPopoverView.swift */; };
23E9673F23613D1100E652F6 /* PreferencesExceptionInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23E9673E23613D1100E652F6 /* PreferencesExceptionInputViewController.swift */; };
6D6893ED2D101933003CE1BF /* ScrollPoster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6893EC2D101933003CE1BF /* ScrollPoster.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -81,7 +81,6 @@
0B74C440205E386D00E3F942 /* Interceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Interceptor.swift; sourceTree = "<group>"; };
0B7C970A253F1C0200B26AF3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
0B7C970B253F1C0300B26AF3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
0B99C5FB2577FC9200021578 /* ScrollPoster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollPoster.swift; sourceTree = "<group>"; };
0BAC4070251651BC00E8A1FD /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Main.strings; sourceTree = "<group>"; };
0BAC4071251651BC00E8A1FD /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
0BAC4072251654C500E8A1FD /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Main.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -125,6 +124,9 @@
23BB4D3021D775D4009B51E9 /* EventMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMonitor.swift; sourceTree = "<group>"; };
23E3C96C21DCE8F10098B107 /* StatusItemPopoverView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusItemPopoverView.swift; sourceTree = "<group>"; };
23E9673E23613D1100E652F6 /* PreferencesExceptionInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesExceptionInputViewController.swift; sourceTree = "<group>"; };
6D6893EC2D101933003CE1BF /* ScrollPoster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollPoster.swift; sourceTree = "<group>"; };
6D6893F12D1115D1003CE1BF /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = SOURCE_ROOT; };
6D6893F22D1115D1003CE1BF /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -144,11 +146,11 @@
isa = PBXGroup;
children = (
2291A8A21E2A5400004181B8 /* ScrollCore.swift */,
6D6893EC2D101933003CE1BF /* ScrollPoster.swift */,
0B12EF1C203ADD230058B169 /* ScrollUtils.swift */,
0BE4C93A20617C6E0001EA0E /* ScrollFilter.swift */,
0B6D3B692041C348004CC064 /* ScrollEvent.swift */,
0B474328258E12A200A5F8A3 /* ScrollPhase.swift */,
0B99C5FB2577FC9200021578 /* ScrollPoster.swift */,
0B12EF1E203ADFB10058B169 /* Interpolator.swift */,
);
path = ScrollCore;
Expand Down Expand Up @@ -251,6 +253,8 @@
22142DA21E25344E00E4BFBF /* Mos */ = {
isa = PBXGroup;
children = (
6D6893F12D1115D1003CE1BF /* CHANGELOG.md */,
6D6893F22D1115D1003CE1BF /* README.md */,
22142DA31E25344E00E4BFBF /* AppDelegate.swift */,
0B6D3B6420419EF5004CC064 /* Utils */,
0B12EF5B203C3D510058B169 /* Options */,
Expand Down Expand Up @@ -433,7 +437,6 @@
239E851123562C34006DE0B0 /* StatusItemPopoverViewContentView.swift in Sources */,
23BB4D2D21D7512F009B51E9 /* StatusItemPopoverViewController.swift in Sources */,
23BB4D3121D775D4009B51E9 /* EventMonitor.swift in Sources */,
0B99C5FC2577FC9200021578 /* ScrollPoster.swift in Sources */,
22816CFF1E2B31020020D6B1 /* MonitorWindowController.swift in Sources */,
234B5EB723506D1F00233097 /* StatusItemMainPanelViewController.swift in Sources */,
22F4EFEF1E325C36009EED31 /* PreferencesTabViewController.swift in Sources */,
Expand All @@ -444,6 +447,7 @@
23E9673F23613D1100E652F6 /* PreferencesExceptionInputViewController.swift in Sources */,
232E50A7236B372100265C58 /* PreferencesAdvanceWithApplicationViewController.swift in Sources */,
22A32B331E334B2E00A5CF38 /* PreferencesAboutViewController.swift in Sources */,
6D6893ED2D101933003CE1BF /* ScrollPoster.swift in Sources */,
0BE4C93B20617C6E0001EA0E /* ScrollFilter.swift in Sources */,
0B6D3B682041A790004CC064 /* WindowManager.swift in Sources */,
0B12EF1A203AD9C80058B169 /* Options.swift in Sources */,
Expand Down Expand Up @@ -623,22 +627,23 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "";
CODE_SIGN_IDENTITY = "-";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2022.10.08;
CURRENT_PROJECT_VERSION = 2024.12.18;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 2H959AEV62;
DEVELOPMENT_TEAM = KN2ZDPF9SC;
ENABLE_HARDENED_RUNTIME = NO;
INFOPLIST_FILE = Mos/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 3.4.1;
MACOSX_DEPLOYMENT_TARGET = 14.6;
MARKETING_VERSION = 5.1.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.caldis.Mos;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -659,22 +664,23 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "";
CODE_SIGN_IDENTITY = "-";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2022.10.08;
CURRENT_PROJECT_VERSION = 2024.12.18;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 2H959AEV62;
DEVELOPMENT_TEAM = KN2ZDPF9SC;
ENABLE_HARDENED_RUNTIME = NO;
GCC_OPTIMIZATION_LEVEL = fast;
INFOPLIST_FILE = Mos/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 3.4.1;
MACOSX_DEPLOYMENT_TARGET = 14.6;
MARKETING_VERSION = 5.1.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.caldis.Mos;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
Loading