From 44adb555449110e1fbe8238fed7ed87aa0f9aa5b Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 19 Nov 2023 20:10:45 +0100
Subject: Separately persisted current layout in landscape mode

Remember the selected layout in portrait and landscape mode
independently.
This allows to define a layout specific to landscape without having to
switch manually.
---
 srcs/juloo.keyboard2/Keyboard2.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index a0766ab..6bc2103 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -44,7 +44,7 @@ public class Keyboard2 extends InputMethodService
     if (_currentSpecialLayout != null)
       return _currentSpecialLayout;
     KeyboardData layout = null;
-    int layout_i = _config.current_layout;
+    int layout_i = _config.get_current_layout();
     if (layout_i >= _config.layouts.size())
       layout_i = 0;
     if (layout_i < _config.layouts.size())
@@ -62,8 +62,6 @@ public class Keyboard2 extends InputMethodService
 
   void setTextLayout(int l)
   {
-    if (l == _config.current_layout)
-      return;
     _config.set_current_layout(l);
     _currentSpecialLayout = null;
     _keyboardView.setKeyboard(current_layout());
@@ -72,7 +70,7 @@ public class Keyboard2 extends InputMethodService
   void incrTextLayout(int delta)
   {
     int s = _config.layouts.size();
-    setTextLayout((_config.current_layout + delta + s) % s);
+    setTextLayout((_config.get_current_layout() + delta + s) % s);
   }
 
   void setSpecialLayout(KeyboardData l)
-- 
cgit v1.2.3