mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hack to keep popup menus alive long enough for Emscripten Qt5

Browse Source 
This fixes <https://github.com/allotropia/zetajs/issues/12> "Is it possible to
make context menu work?"

Change-Id: Ib89b638dd94210bae13017554c30c3172e299102
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184315
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann
2025-04-17 10:34:14 +02:00
parent 92a8731e0b
commit 39bd06ad1e
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sfx2/source/control/dispatch.cxx
View File

@@ -40,6 +40,7 @@
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertyvalue.hxx>
#include <config_vclplug.h>
#include <officecfg/Office/Common.hxx>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
@@ -1902,6 +1903,23 @@ void SfxDispatcher::ExecutePopup( const OUString& rResName, vcl::Window* pWin, c
css::uno::Reference< css::frame::XPopupMenuController > xPopupController(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
u"com.sun.star.comp.framework.ResourceMenuController"_ustr, aArgs, xContext ), css::uno::UNO_QUERY );
#if defined EMSCRIPTEN && ENABLE_QT5
// At least under Emscripten with Qt5, the QMenu::exec underlying the below call to
// xPopupMenu->execute returns immediately, without going into a new event loop, and we need to
// keep the underlying QMenu instance alive via the static lastPopupController chain here, until
// the next popup menu is opened (there can only ever be a single popup menu open, so it
// suffices to have a single static lastPopupController instance):
static css::uno::Reference<css::frame::XPopupMenuController> lastPopupController;
if (lastPopupController.is()) {
if (css::uno::Reference<css::lang::XComponent> component(
lastPopupController, css::uno::UNO_QUERY);
component.is())
{
component->dispose();
}
lastPopupController = xPopupController;
}
#endif
rtl::Reference< VCLXPopupMenu > xPopupMenu = new VCLXPopupMenu();
@@ -1938,9 +1956,11 @@ void SfxDispatcher::ExecutePopup( const OUString& rResName, vcl::Window* pWin, c
}
}
#if !(defined EMSCRIPTEN && ENABLE_QT5)
css::uno::Reference< css::lang::XComponent > xComponent( xPopupController, css::uno::UNO_QUERY );
if ( xComponent.is() )
xComponent->dispose();
#endif
}
/** With this method the SfxDispatcher can be locked and released. A locked