Make alpha=0 available

木

Makefile

@@ -12,11 +12,11 @@ RIME_LIB_DIR = librime/dist/lib
 RIME_LIBRARY_FILE_NAME = librime.1.dylib
 RIME_LIBRARY = lib/$(RIME_LIBRARY_FILE_NAME)
 
-RIME_DEPS = librime/thirdparty/lib/libcapnp.a \
-	librime/thirdparty/lib/libmarisa.a \
-	librime/thirdparty/lib/libleveldb.a \
-	librime/thirdparty/lib/libopencc.a \
-	librime/thirdparty/lib/libyaml-cpp.a
+RIME_DEPS = librime/lib/libcapnp.a \
+	librime/lib/libmarisa.a \
+	librime/lib/libleveldb.a \
+	librime/lib/libopencc.a \
+	librime/lib/libyaml-cpp.a
 PLUM_DATA = bin/rime-install \
 	data/plum/default.yaml \
 	data/plum/symbols.yaml \
@@ -27,7 +27,7 @@ OPENCC_DATA = data/opencc/TSCharacters.ocd2 \
 SPARKLE_FRAMEWORK = Frameworks/Sparkle.framework
 DEPS_CHECK = $(RIME_LIBRARY) $(PLUM_DATA) $(OPENCC_DATA) $(SPARKLE_FRAMEWORK)
 
-OPENCC_DATA_OUTPUT = librime/thirdparty/share/opencc/*.*
+OPENCC_DATA_OUTPUT = librime/share/opencc/*.*
 PLUM_DATA_OUTPUT = plum/output/*.*
 RIME_PACKAGE_INSTALLER = plum/rime-install
 
@@ -40,7 +40,7 @@ $(RIME_LIBRARY):
 	$(MAKE) librime
 
 $(RIME_DEPS):
-	$(MAKE) -C librime xcode/thirdparty
+	$(MAKE) -C librime xcode/deps
 
 librime: $(RIME_DEPS)
 	$(MAKE) -C librime $(RIME_DIST_TARGET)
@@ -68,7 +68,7 @@ plum-data:
 	$(MAKE) copy-plum-data
 
 opencc-data:
-	$(MAKE) -C librime xcode/thirdparty/opencc
+	$(MAKE) -C librime xcode/deps/opencc
 	$(MAKE) copy-opencc-data
 
 copy-plum-data:

SquirrelPanel.m

@@ -1560,7 +1560,8 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo
   CGFloat labelFontSize = [config getDouble:@"style/label_font_point"];
   NSString *commentFontName = [config getString:@"style/comment_font_face"];
   CGFloat commentFontSize = [config getDouble:@"style/comment_font_point"];
-  CGFloat alpha = fmin(fmax([config getDouble:@"style/alpha"], 0.0), 1.0);
+  NSNumber *alphaValue = [config getOptionalDouble:@"style/alpha"];
+  CGFloat alpha = alphaValue ? fmin(fmax(alphaValue.doubleValue, 0.0), 1.0) : 1.0;
   CGFloat cornerRadius = [config getDouble:@"style/corner_radius"];
   CGFloat hilitedCornerRadius = [config getDouble:@"style/hilited_corner_radius"];
   CGFloat surroundingExtraExpansion = [config getDouble:@"style/surrounding_extra_expansion"];