diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-28 17:32:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-28 21:30:40 +0200 |
| commit | 164e0d7b104a343d3d4b2d66b46f0dfa73b69a88 (patch) | |
| tree | aff79492a31a7dfbbe344c3a5bbfadf12fb27d00 /cui | |
| parent | fdab153636ad7e3ce4b09836a63d2fa11b42e728 (diff) | |
Resolves: tdf#124931 key stroke in shortcut keys not selecting the key combo
Change-Id: Ife3e99e0cf00d7d320eb8e403743d42fb8274df8
Reviewed-on: https://gerrit.libreoffice.org/71483
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 43 | ||||
| -rw-r--r-- | cui/source/inc/acccfg.hxx | 3 |
2 files changed, 46 insertions, 0 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 8a3e6d203a1b..d5b38b0f8625 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -33,6 +33,7 @@ #include <sal/macros.h> #include <vcl/edit.hxx> +#include <vcl/event.hxx> #include <strings.hrc> #include <sfx2/strings.hrc> @@ -777,6 +778,47 @@ static const sal_uInt16 KEYCODE_ARRAY[] = static const sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY); +/** select the entry, which match the current key input ... excepting + keys, which are used for the dialog itself. + */ +IMPL_LINK(SfxAcceleratorConfigPage, KeyInputHdl, const KeyEvent&, rKey, bool) +{ + vcl::KeyCode aCode1 = rKey.GetKeyCode(); + sal_uInt16 nCode1 = aCode1.GetCode(); + sal_uInt16 nMod1 = aCode1.GetModifier(); + + // is it related to our list box ? + if ( + (nCode1 != KEY_DOWN ) && + (nCode1 != KEY_UP ) && + (nCode1 != KEY_LEFT ) && + (nCode1 != KEY_RIGHT ) && + (nCode1 != KEY_PAGEUP ) && + (nCode1 != KEY_PAGEDOWN) + ) + { + for (int i = 0, nCount = m_xEntriesBox->n_children(); i < nCount; ++i) + { + TAccInfo* pUserData = reinterpret_cast<TAccInfo*>(m_xEntriesBox->get_id(i).toInt64()); + if (pUserData) + { + sal_uInt16 nCode2 = pUserData->m_aKey.GetCode(); + sal_uInt16 nMod2 = pUserData->m_aKey.GetModifier(); + + if (nCode1 == nCode2 && nMod1 == nMod2) + { + m_xEntriesBox->select(i); + m_xEntriesBox->scroll_to_row(i); + return true; + } + } + } + } + + // no - handle it as normal dialog input + return false; +} + SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& aSet ) : SfxTabPage(pParent, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet) , m_pMacroInfoItem() @@ -816,6 +858,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const m_xChangeButton->connect_clicked( LINK( this, SfxAcceleratorConfigPage, ChangeHdl )); m_xRemoveButton->connect_clicked( LINK( this, SfxAcceleratorConfigPage, RemoveHdl )); m_xEntriesBox->connect_changed ( LINK( this, SfxAcceleratorConfigPage, SelectHdl )); + m_xEntriesBox->connect_key_press( LINK( this, SfxAcceleratorConfigPage, KeyInputHdl )); m_xGroupLBox->connect_changed ( LINK( this, SfxAcceleratorConfigPage, SelectHdl )); m_xFunctionBox->connect_changed( LINK( this, SfxAcceleratorConfigPage, SelectHdl )); m_xKeyBox->connect_changed ( LINK( this, SfxAcceleratorConfigPage, SelectHdl )); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index beaad3acd394..5601f08406a9 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -130,6 +130,9 @@ private: DECL_LINK(FocusOut_Impl, weld::Widget&, void); DECL_LINK(TimeOut_Impl, Timer*, void); + DECL_LINK(KeyInputHdl, const KeyEvent&, bool); + + DECL_LINK(LoadHdl, sfx2::FileDialogHelper *, void); DECL_LINK(SaveHdl, sfx2::FileDialogHelper *, void); |