From 75fdc2bfa9cfe7ad5b743105c3679e2fdc3110e3 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 27 Feb 2025 23:20:49 +0100 Subject: [PATCH] Fix miscalculation of the bottom margin '_marginBottom' might be uninitialized when used. --- srcs/juloo.keyboard2/Keyboard2View.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java index 90bbd00..b561eb4 100644 --- a/srcs/juloo.keyboard2/Keyboard2View.java +++ b/srcs/juloo.keyboard2/Keyboard2View.java @@ -296,15 +296,15 @@ public class Keyboard2View extends View DisplayMetrics dm = getContext().getResources().getDisplayMetrics(); width = dm.widthPixels; } - int height = - (int)(_config.keyHeight * _keyboard.keysHeight - + _config.marginTop + _marginBottom); - setMeasuredDimension(width, height); _marginLeft = Math.max(_config.horizontal_margin, insets_left); _marginRight = Math.max(_config.horizontal_margin, insets_right); _marginBottom = _config.margin_bottom + insets_bottom; _keyWidth = (width - _marginLeft - _marginRight) / _keyboard.keysWidth; _tc = new Theme.Computed(_theme, _config, _keyWidth); + int height = + (int)(_config.keyHeight * _keyboard.keysHeight + + _config.marginTop + _marginBottom); + setMeasuredDimension(width, height); } @Override