shadow_size candidate_back_color

groverlynn · May 24, 2024 · c603520 · c603520
1 parent b209906
commit c603520
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 80 deletions.
diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
@@ -653,7 +653,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.16.2u;
+				CURRENT_PROJECT_VERSION = 0.18.0u;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -709,7 +709,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.16.2u;
+				CURRENT_PROJECT_VERSION = 0.18.0u;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/SquirrelConfig.hh b/SquirrelConfig.hh
@@ -4,15 +4,15 @@
 __attribute__((objc_direct_members))
 @interface SquirrelOptionSwitcher : NSObject
 
-@property(nonatomic, strong, readonly, nonnull) NSString* schemaId;
-@property(nonatomic, strong, readonly, nonnull) NSString* currentScriptVariant;
-@property(nonatomic, strong, readonly, nonnull) NSSet<NSString*>* optionNames;
-@property(nonatomic, strong, readonly, nonnull) NSSet<NSString*>* optionStates;
-@property(nonatomic, strong, readonly, nonnull)
+@property(nonatomic, readonly, strong, nonnull) NSString* schemaId;
+@property(nonatomic, readonly, strong, nonnull) NSString* currentScriptVariant;
+@property(nonatomic, readonly, strong, nonnull) NSSet<NSString*>* optionNames;
+@property(nonatomic, readonly, strong, nonnull) NSSet<NSString*>* optionStates;
+@property(nonatomic, readonly, strong, nonnull)
     NSDictionary<NSString*, NSString*>* scriptVariantOptions;
-@property(nonatomic, strong, readonly, nonnull)
+@property(nonatomic, readonly, strong, nonnull)
     NSMutableDictionary<NSString*, NSString*>* switcher;
-@property(nonatomic, strong, readonly, nonnull)
+@property(nonatomic, readonly, strong, nonnull)
     NSDictionary<NSString*, NSOrderedSet<NSString*>*>* optionGroups;
 
 - (instancetype _Nonnull)

diff --git a/SquirrelInputController.hh b/SquirrelInputController.hh
@@ -32,13 +32,13 @@ typedef NS_ENUM(NSUInteger, SquirrelIndex) {
   kVoidSymbol = 0xffffff  // XK_VoidSymbol
 };
 
-@property(nonatomic, weak, readonly, nullable, direct, class)
+@property(nonatomic, readonly, weak, nullable, direct, class)
     SquirrelInputController* currentController;
-@property(nonatomic, strong, readonly, nonnull)
+@property(nonatomic, readonly, strong, nonnull)
     NSAppearance* viewEffectiveAppearance API_AVAILABLE(macos(10.14));
-@property(nonatomic, strong, readonly, nonnull, direct)
+@property(nonatomic, readonly, strong, nonnull, direct)
     NSMutableArray<NSString*>* candidateTexts;
-@property(nonatomic, strong, readonly, nonnull, direct)
+@property(nonatomic, readonly, strong, nonnull, direct)
     NSMutableArray<NSString*>* candidateComments;
 
 - (void)moveCursor:(NSUInteger)cursorPosition

diff --git a/SquirrelPanel.hh b/SquirrelPanel.hh
@@ -22,10 +22,10 @@
 @property(nonatomic, direct) NSUInteger sectionNum;
 // position of the text input I-beam cursor on screen.
 @property(nonatomic, direct) NSRect IbeamRect;
-@property(nonatomic, strong, readonly, nullable) NSScreen* screen;
+@property(nonatomic, readonly, strong, nullable) NSScreen* screen;
 // Status message before pop-up is displayed; nil before normal panel is
 // displayed
-@property(nonatomic, strong, readonly, nullable, direct)
+@property(nonatomic, readonly, strong, nullable, direct)
     NSString* statusMessage;
 // Store switch options that change style (color theme) settings
 @property(nonatomic, strong, nonnull, direct)