diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-15 09:45:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-15 11:33:11 +0200 |
| commit | c9ba2d9373b40ae6262f4078bf5f5e64a5ba855b (patch) | |
| tree | b33d66ecfa95b7d42414dcdf5674475f81addd2c | |
| parent | 514bc435cd9c8f8f7c4fb31f2bbfde80ed667fe6 (diff) | |
tdf#131333 SalMenus propogate to parent their selected id conditionally
Menu::Select depends on its handler returning false to allow propogating a
submens's selected id to its parent menu to become its selected id.
without this, while gen menus already have propogated this to its parent in
MenuFloatingWindow::EndExecute, SalMenus as used under kf5/macOS won't
propogate the selected id
Change-Id: I1d87cb0deacdf5fbfb837acc21c2d23b79525aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94263
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index fef4615ab96f..b9dac643b851 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -737,7 +737,15 @@ SalInstanceMenu::~SalInstanceMenu() IMPL_LINK_NOARG(SalInstanceMenu, SelectMenuHdl, ::Menu*, bool) { signal_activate(m_xMenu->GetCurItemIdent()); - return true; + /* tdf#131333 Menu::Select depends on a false here to allow + propogating a submens's selected id to its parent menu to become its + selected id. + + without this, while gen menus already have propogated this to its parent + in MenuFloatingWindow::EndExecute, SalMenus as used under kf5/macOS + won't propogate the selected id + */ + return false; } namespace |