fix: key properties should fallback to keyboard's

Bambooin · Sep 21, 2021 · f058710 · f058710
1 parent 86ad95e
commit f058710
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java
@@ -222,15 +222,24 @@ public Keyboard(Context context, String name) {
         continue; // 縮進
       }
 
+      final int defaultKeyTextOffsetX = YamlUtils.INSTANCE.getPixel(m, "key_text_offset_x", 0);
+      final int defaultKeyTextOffsetY = YamlUtils.INSTANCE.getPixel(m, "key_text_offset_y", 0);
+      final int defaultKeySymbolOffsetX = YamlUtils.INSTANCE.getPixel(m, "key_symbol_offset_x", 0);
+      final int defaultKeySymbolOffsetY = YamlUtils.INSTANCE.getPixel(m, "key_symbol_offset_y", 0);
+      final int defaultKeyHintOffsetX = YamlUtils.INSTANCE.getPixel(m, "key_hint_offset_x", 0);
+      final int defaultKeyHintOffsetY = YamlUtils.INSTANCE.getPixel(m, "key_hint_offset_y", 0);
+      final int defaultKeyPressOffsetX = YamlUtils.INSTANCE.getInt(m, "key_press_offset_x", 0);
+      final int defaultKeyPressOffsetY = YamlUtils.INSTANCE.getInt(m, "key_press_offset_y", 0);
+
       final Key key = new Key(context, this, mk);
-      key.setKey_text_offset_x(YamlUtils.INSTANCE.getPixel(mk, "key_text_offset_x", 0));
-      key.setKey_text_offset_y(YamlUtils.INSTANCE.getPixel(mk, "key_text_offset_y", 0));
-      key.setKey_symbol_offset_x(YamlUtils.INSTANCE.getPixel(mk, "key_symbol_offset_x", 0));
-      key.setKey_symbol_offset_y(YamlUtils.INSTANCE.getPixel(mk, "key_symbol_offset_y", 0));
-      key.setKey_hint_offset_x(YamlUtils.INSTANCE.getPixel(mk, "key_hint_offset_x", 0));
-      key.setKey_hint_offset_y(YamlUtils.INSTANCE.getPixel(mk, "key_hint_offset_y", 0));
-      key.setKey_press_offset_x(YamlUtils.INSTANCE.getInt(mk, "key_press_offset_x", 2));
-      key.setKey_press_offset_y(YamlUtils.INSTANCE.getInt(mk, "key_press_offset_y", 2));
+      key.setKey_text_offset_x(YamlUtils.INSTANCE.getPixel(mk, "key_text_offset_x", defaultKeyTextOffsetX));
+      key.setKey_text_offset_y(YamlUtils.INSTANCE.getPixel(mk, "key_text_offset_y", defaultKeyTextOffsetY));
+      key.setKey_symbol_offset_x(YamlUtils.INSTANCE.getPixel(mk, "key_symbol_offset_x", defaultKeySymbolOffsetX));
+      key.setKey_symbol_offset_y(YamlUtils.INSTANCE.getPixel(mk, "key_symbol_offset_y", defaultKeySymbolOffsetY));
+      key.setKey_hint_offset_x(YamlUtils.INSTANCE.getPixel(mk, "key_hint_offset_x", defaultKeyHintOffsetX));
+      key.setKey_hint_offset_y(YamlUtils.INSTANCE.getPixel(mk, "key_hint_offset_y", defaultKeyHintOffsetY));
+      key.setKey_press_offset_x(YamlUtils.INSTANCE.getInt(mk, "key_press_offset_x", defaultKeyPressOffsetX));
+      key.setKey_press_offset_y(YamlUtils.INSTANCE.getInt(mk, "key_press_offset_y", defaultKeyPressOffsetY));
 
       key.setX(x);
       key.setY(y);