[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 23 11:32:03 UTC 2019
vcl/unx/gtk3/gtk3gtkinst.cxx | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 60f469f585899e97f3dbc9b98b12d36d9b665eff
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 19 10:24:42 2019 +0000
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Dec 23 12:30:56 2019 +0100
Resolves: tdf#129484 just install decimal key handler for spinbuttons
as a simple interim fix
Change-Id: I7e393fe20f4fb7ea277c423f9fc9789d658b1e18
Reviewed-on: https://gerrit.libreoffice.org/85507
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 186b3f2bb2a0..e0bbf6dd4cdc 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1402,6 +1402,14 @@ protected:
return pThis->signal_popup_menu(aCEvt);
}
+ void localizeDecimalSeparator()
+ {
+ // tdf#128867 if localize decimal separator is active we will always
+ // need to be able to change the output of the decimal key press
+ if (!m_nKeyPressSignalId && Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
+ m_nKeyPressSignalId = g_signal_connect(m_pWidget, "key-press-event", G_CALLBACK(signalKey), this);
+ }
+
private:
bool m_bTakeOwnership;
bool m_bFrozen;
@@ -1627,10 +1635,6 @@ public:
, m_nDragDropReceivedSignalId(0)
, m_nDragLeaveSignalId(0)
{
- // tdf#128867 if localize decimal separator is active we will always
- // need to be able to change the output of the decimal key press
- if (Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
- m_nKeyPressSignalId = g_signal_connect(m_pWidget, "key-press-event", G_CALLBACK(signalKey), this);
}
virtual void connect_key_press(const Link<const KeyEvent&, bool>& rLink) override
@@ -8344,6 +8348,7 @@ public:
, m_bBlockOutput(false)
, m_bBlank(false)
{
+ localizeDecimalSeparator();
}
virtual int get_value() const override
More information about the Libreoffice-commits
mailing list