diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-29 20:49:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-30 13:10:39 +0200 |
| commit | db8f2b30fe56bfde46c3dac0dad6661cb7464b4a (patch) | |
| tree | eab7658c4bde2101b000957ceea9b401c9d131e2 /vcl | |
| parent | 4d2f76e59b9b6d459a623366912eac00864a956d (diff) | |
tdf#134390 update spin button before processing activate signal
Change-Id: I698c789c9fe79e931547d8b230a4885393f5ff28
and
Related: tdf#134390 allow entry "activate" for gen spinbutton
Change-Id: I3c497586479a08089f167ccb890e79e7b9d1f4bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97459
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit fac0288099ef7acabafa214a47ed0ec342414bae)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97477
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 6a8042ba2b1c..535ac3566cde 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -5151,7 +5151,7 @@ IMPL_LINK_NOARG(SalInstanceSpinButton, ActivateHdl, Edit&, bool) { // tdf#122348 return pressed to end dialog signal_value_changed(); - return false; + return m_aActivateHdl.Call(*this); } IMPL_LINK_NOARG(SalInstanceSpinButton, UpDownHdl, SpinField&, void) { signal_value_changed(); } diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 7c968124ad18..2eb237ef5009 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -8661,7 +8661,9 @@ private: pThis->signal_activate(); } - void signal_activate() +protected: + + virtual void signal_activate() { if (m_aActivateHdl.IsSet()) { @@ -11843,6 +11845,12 @@ private: return GTK_INPUT_ERROR; } + virtual void signal_activate() override + { + gtk_spin_button_update(m_pButton); + GtkInstanceEntry::signal_activate(); + } + double toGtk(int nValue) const { return static_cast<double>(nValue) / Power10(get_digits()); |