abouttreesummaryrefslogcommitdiff
path: root/srcs
diff options
context:
space:
mode:
authorJules Aguillon2023-01-15 19:19:07 +0100
committerJules Aguillon2023-01-15 19:19:07 +0100
commitfd0f0d54766de6c5621e5a09e192f75f3c05782c (patch)
tree6e87f2af3b6cababb86d9efaf8d57d2d4021da38 /srcs
parenta1999621178ad9fd1de713a9b9f485f110e4d899 (diff)
downloadunexpected-keyboard-fd0f0d54766de6c5621e5a09e192f75f3c05782c.tar.gz
unexpected-keyboard-fd0f0d54766de6c5621e5a09e192f75f3c05782c.zip
Separate option for bottom margin in landscape mode
A large margin in portrait mode is desirable but generally not in landscape mode.
Diffstat (limited to 'srcs')
-rw-r--r--srcs/juloo.keyboard2/Config.java4
-rw-r--r--srcs/juloo.keyboard2/Keyboard2View.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 24a396d..3a22118 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -32,7 +32,7 @@ final class Config
public boolean vibrateEnabled;
public long longPressTimeout;
public long longPressInterval;
- public float marginBottom;
+ public float margin_bottom;
public float keyHeight;
public float horizontal_margin;
public float keyVerticalInterval;
@@ -122,7 +122,7 @@ final class Config
vibrateEnabled = _prefs.getBoolean("vibrate_enabled", true);
longPressTimeout = _prefs.getInt("longpress_timeout", 600);
longPressInterval = _prefs.getInt("longpress_interval", 65);
- marginBottom = get_dip_pref(dm, "margin_bottom",
+ margin_bottom = get_dip_pref(dm, oriented_pref("margin_bottom"),
res.getDimension(R.dimen.margin_bottom));
keyVerticalInterval = get_dip_pref(dm, "key_vertical_space",
res.getDimension(R.dimen.key_vertical_interval));
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 835d595..be7647d 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -230,7 +230,7 @@ public class Keyboard2View extends View
int height =
(int)(_config.keyHeight * _keyboard.keysHeight
+ _keyboard.rows.size()
- + _config.marginTop + _config.marginBottom);
+ + _config.marginTop + _config.margin_bottom);
setMeasuredDimension(width, height);
_keyWidth = (width - (_config.horizontal_margin * 2)) / _keyboard.keysWidth;
}
@@ -247,7 +247,7 @@ public class Keyboard2View extends View
left + (int)_config.horizontal_margin,
top + (int)_config.marginTop,
right - (int)_config.horizontal_margin,
- bottom - (int)_config.marginBottom);
+ bottom - (int)_config.margin_bottom);
setSystemGestureExclusionRects(Arrays.asList(keyboard_area));
}
}