From 90b7944129ae0facc5c789f0a416f7ff36925a90 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Mon, 30 Jan 2023 22:33:01 +0100
Subject: Apply modify_layout to text layout only

Refactor. Allows to remove the 'extra_keys' and 'num_pad' flags and to
implement more complicated transformations to the layouts.
---
 srcs/juloo.keyboard2/Keyboard2.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 6558539..5070439 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -47,9 +47,14 @@ public class Keyboard2 extends InputMethodService
   {
     if (_currentSpecialLayout != null)
       return _currentSpecialLayout;
+    KeyboardData layout;
     if (_currentTextLayout == Current_text_layout.SECONDARY)
-      return _config.second_layout;
-    return (_config.layout == null) ? _localeTextLayout : _config.layout;
+      layout = _config.second_layout;
+    else if (_config.layout == null)
+      layout = _localeTextLayout;
+    else
+      layout = _config.layout;
+    return _config.modify_layout(layout);
   }
 
   void setTextLayout(Current_text_layout layout)
-- 
cgit v1.2.3