diff --git a/App/SupportFiles/Info.plist b/App/SupportFiles/Info.plist index 187ac86eb..ae1258194 100644 --- a/App/SupportFiles/Info.plist +++ b/App/SupportFiles/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 21983 + 21987 LSApplicationCategoryType public.app-category.utilities NSHumanReadableCopyright diff --git a/Helper/Core/Modifiers/Modifiers.m b/Helper/Core/Modifiers/Modifiers.m index 5f504ed64..ba97c3cf1 100644 --- a/Helper/Core/Modifiers/Modifiers.m +++ b/Helper/Core/Modifiers/Modifiers.m @@ -40,6 +40,9 @@ @implementation Modifiers /// Update: /// (At the time of writing, this change is not yet reflected in the other comments in this class.)`Modifiers` class now has a single `modifiers` instance var which is updated whenever modifiers change. When some module requests the current modifiers that instance var is simply returned. Before, the modifiers were recompiled each time they were requested. The whole idea of "modifier driven" and "trigger driven" modifications is now not used anymore. All modifications are in effect "modifier driven". This does mean we always listen to keyboard modifiers which is bad. But that will allow us to turn off other event interception dynamically. For example when the user has scrolling enhancements turned off we can turn the scrollwheel eventTap off but then when they hold a modifier for scroll-to-zoom we can dynamically turn the tap on again. Ideally we'd only tap into the keyboard mod event stream if there is such a situation where the keyboard mods can toggle another tap and otherwise turn the keyboard mod tap off. I'll look into that. +/// +/// Update: +/// Most of this stuff is outdated now. Now, the MasterSwitch toggles between actively listening to modifiers vs passively retrieving them on request. The active listening simply notifies the SwitchMaster that the modifers changed. #pragma mark - Storage diff --git a/Helper/SupportFiles/Info.plist b/Helper/SupportFiles/Info.plist index 4081bf9bf..e6a58bf30 100644 --- a/Helper/SupportFiles/Info.plist +++ b/Helper/SupportFiles/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 21983 + 21987 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly diff --git a/Mouse Fix.xcodeproj/project.pbxproj b/Mouse Fix.xcodeproj/project.pbxproj index e3f1764f3..62b183f96 100644 --- a/Mouse Fix.xcodeproj/project.pbxproj +++ b/Mouse Fix.xcodeproj/project.pbxproj @@ -2868,7 +2868,7 @@ ); INFOPLIST_FILE = App/SupportFiles/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - MARKETING_VERSION = "3.0.0 GM"; + MARKETING_VERSION = "3.0.0 Beta 7"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.nuebling.mac-mouse-fix"; @@ -2903,7 +2903,7 @@ ); INFOPLIST_FILE = App/SupportFiles/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - MARKETING_VERSION = "3.0.0 GM"; + MARKETING_VERSION = "3.0.0 Beta 7"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.nuebling.mac-mouse-fix"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Shared/Config/default_config.plist b/Shared/Config/default_config.plist index 65f0467a9..85029c119 100644 --- a/Shared/Config/default_config.plist +++ b/Shared/Config/default_config.plist @@ -77,7 +77,7 @@ Constants configVersion - 19 + 20 defaultRemaps threeButtons