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 13:19:53 +0200 |
| commit | 98d3ef152b7655e1aab2023304d4644380d5850c (patch) | |
| tree | d2b3e4021ba1650ca4ca33eeb280030626d45361 | |
| parent | 81a3e3416dab99c11f7bfa61d1a859edbacbcacf (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/+/94268
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Jenkins
| -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 9bfeb9997041..042008200709 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -930,7 +930,15 @@ public: 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; } class SalInstanceToolbar : public SalInstanceWidget, public virtual weld::Toolbar |