diff --git a/SquirrelPanel.m b/SquirrelPanel.m index 892471dd4..94e095e0a 100644 --- a/SquirrelPanel.m +++ b/SquirrelPanel.m @@ -961,28 +961,32 @@ - (void)initializeUIStyleForDarkMode:(BOOL)isDark { NSColor *secondaryTextColor = [[self class] secondaryTextColor]; - NSMutableDictionary *attrs = [[NSMutableDictionary alloc] init]; + NSMutableDictionary *defaultAttrs = [[NSMutableDictionary alloc] init]; + // solve terminal hijack when non-inline + defaultAttrs[IMKCandidatesSendServerKeyEventFirst] = @(YES); + + NSMutableDictionary *attrs = [defaultAttrs mutableCopy]; attrs[NSForegroundColorAttributeName] = [NSColor controlTextColor]; attrs[NSFontAttributeName] = [NSFont userFontOfSize:kDefaultFontSize]; - NSMutableDictionary *highlightedAttrs = [[NSMutableDictionary alloc] init]; + NSMutableDictionary *highlightedAttrs = [defaultAttrs mutableCopy]; highlightedAttrs[NSForegroundColorAttributeName] = [NSColor selectedControlTextColor]; highlightedAttrs[NSFontAttributeName] = [NSFont userFontOfSize:kDefaultFontSize]; NSMutableDictionary *labelAttrs = [attrs mutableCopy]; NSMutableDictionary *labelHighlightedAttrs = [highlightedAttrs mutableCopy]; - NSMutableDictionary *commentAttrs = [[NSMutableDictionary alloc] init]; + NSMutableDictionary *commentAttrs = [defaultAttrs mutableCopy]; commentAttrs[NSForegroundColorAttributeName] = secondaryTextColor; commentAttrs[NSFontAttributeName] = [NSFont userFontOfSize:kDefaultFontSize]; NSMutableDictionary *commentHighlightedAttrs = [commentAttrs mutableCopy]; - NSMutableDictionary *preeditAttrs = [[NSMutableDictionary alloc] init]; + NSMutableDictionary *preeditAttrs = [defaultAttrs mutableCopy]; preeditAttrs[NSForegroundColorAttributeName] = secondaryTextColor; preeditAttrs[NSFontAttributeName] = [NSFont userFontOfSize:kDefaultFontSize]; - NSMutableDictionary *preeditHighlightedAttrs = [[NSMutableDictionary alloc] init]; + NSMutableDictionary *preeditHighlightedAttrs = [defaultAttrs mutableCopy]; preeditHighlightedAttrs[NSForegroundColorAttributeName] = [NSColor controlTextColor]; preeditHighlightedAttrs[NSFontAttributeName] = [NSFont userFontOfSize:kDefaultFontSize]; diff --git a/data/squirrel.yaml b/data/squirrel.yaml index 71c4fb8df..54fd985d9 100644 --- a/data/squirrel.yaml +++ b/data/squirrel.yaml @@ -341,7 +341,6 @@ app_options: com.apple.Terminal: ascii_mode: true no_inline: true - inline_placeholder: true com.googlecode.iterm2: ascii_mode: true no_inline: true