From b079e5cf436ccd4ef83ee00031b0955b1595ef1a Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 3 Sep 2023 23:36:49 +0200
Subject: [PATCH] Consistent layout for optional numpad

Modify the optional right hand numpad the same way as the numeric
layout.
---
 srcs/juloo.keyboard2/Config.java       | 2 +-
 srcs/juloo.keyboard2/KeyboardData.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index b40a41c..8900656 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -242,7 +242,7 @@ final class Config
       }
     });
     if (show_numpad)
-      kw = kw.addNumPad();
+      kw = kw.addNumPad(modify_numpad(KeyboardData.num_pad));
     if (number_row)
       kw = kw.addNumberRow();
     if (extra_keys.size() > 0)
diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java
index d37281b..b5218e4 100644
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -54,7 +54,7 @@ class KeyboardData
     return new KeyboardData(rows, keysWidth, modmap, script);
   }
 
-  public KeyboardData addNumPad()
+  public KeyboardData addNumPad(KeyboardData num_pad)
   {
     ArrayList<Row> extendedRows = new ArrayList<Row>();
     Iterator<Row> iterNumPadRows = num_pad.rows.iterator();