diff options
Diffstat (limited to 'srcs/juloo.keyboard2/KeyboardData.java')
| -rw-r--r-- | srcs/juloo.keyboard2/KeyboardData.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java index 0c54291..9450c9e 100644 --- a/srcs/juloo.keyboard2/KeyboardData.java +++ b/srcs/juloo.keyboard2/KeyboardData.java @@ -31,6 +31,8 @@ public final class KeyboardData public final String name; /** Whether the bottom row should be added. */ public final boolean bottom_row; + /** Whether the number row is included in the layout and thus another one shouldn't be added. */ + public final boolean embedded_number_row; /** Whether extra keys from [method.xml] should be added to this layout. */ public final boolean locale_extra_keys; /** Position of every keys on the layout, see [getKeys()]. */ @@ -239,6 +241,7 @@ public final class KeyboardData if (!expect_tag(parser, "keyboard")) throw error(parser, "Expected tag <keyboard>"); boolean bottom_row = attribute_bool(parser, "bottom_row", true); + boolean embedded_number_row = attribute_bool(parser, "embedded_number_row", false); boolean locale_extra_keys = attribute_bool(parser, "locale_extra_keys", true); float specified_kw = attribute_float(parser, "width", 0f); String script = parser.getAttributeValue(null, "script"); @@ -269,7 +272,7 @@ public final class KeyboardData } } float kw = (specified_kw != 0f) ? specified_kw : compute_max_width(rows); - return new KeyboardData(rows, kw, modmap, script, numpad_script, name, bottom_row, locale_extra_keys); + return new KeyboardData(rows, kw, modmap, script, numpad_script, name, bottom_row, embedded_number_row, locale_extra_keys); } private static float compute_max_width(List<Row> rows) @@ -288,7 +291,7 @@ public final class KeyboardData } protected KeyboardData(List<Row> rows_, float kw, Modmap mm, String sc, - String npsc, String name_, boolean bottom_row_, boolean locale_extra_keys_) + String npsc, String name_, boolean bottom_row_, boolean embedded_number_row_, boolean locale_extra_keys_) { float kh = 0.f; for (Row r : rows_) @@ -301,6 +304,7 @@ public final class KeyboardData keysWidth = Math.max(kw, 1f); keysHeight = kh; bottom_row = bottom_row_; + embedded_number_row = embedded_number_row_; locale_extra_keys = locale_extra_keys_; } @@ -308,7 +312,7 @@ public final class KeyboardData protected KeyboardData(KeyboardData src, List<Row> rows) { this(rows, compute_max_width(rows), src.modmap, src.script, - src.numpad_script, src.name, src.bottom_row, src.locale_extra_keys); + src.numpad_script, src.name, src.bottom_row, src.embedded_number_row, src.locale_extra_keys); } public static class Row |