[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-7' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8484b7a1a5ad33da84ba536ce4ca0bbe1e7f2e75
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 20 09:49:36 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Apr 24 17:34:51 2023 +0200

    Resolves: tdf#154623 KEY_DECIMAL == GDK_KEY_KP_Decimal or 
GDK_KEY_KP_Separator
    
    Change-Id: Iade6d3f93ff7f9dcc35c5a04e21617df06955527
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150623
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins
    (cherry picked from commit 50253a2cb2e1b604f0d5bfb5be1d6f91eaa0bc8b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150625
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit f186dd4946c87ff2252d3cc330d564f0b92b32d6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150629
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 1841ebbaf7f4..592641504018 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2479,8 +2479,9 @@ GtkWindow* get_active_window()
 
 void LocalizeDecimalSeparator(guint& keyval)
 {
-    // #i1820# use locale specific decimal separator
-    if (keyval == GDK_KEY_KP_Decimal && 
Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
+    const bool bDecimalKey = keyval == GDK_KEY_KP_Decimal || keyval == 
GDK_KEY_KP_Separator;
+    // #i1820# (and tdf#154623) use locale specific decimal separator
+    if (bDecimalKey && 
Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
     {
         GtkWindow* pFocusWin = get_active_window();
         GtkWidget* pFocus = pFocusWin ? gtk_window_get_focus(pFocusWin) : 
nullptr;