[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 vcl/inc/salvtables.hxx        |    6 +++---
 vcl/source/app/salvtables.cxx |   23 ++++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 7078083e31cf54d9b46f4b0dd0c5ca557d08779a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 29 13:00:45 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 29 20:17:55 2021 +0200

    tdf#143088 multiple Application::EventListeners is expensive
    
    use a Window level Listener and a WindowChild Listener instead
    
    An example for the need to listener to children is the calc conditional
    formatting dialog where clicking on any subentry of an collapsed entry
    is expected to expand that entry
    
    Change-Id: Ifead2fc1b75457d3ad314fdf15d343395afae6d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118097
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index e8c268957ef3..d3789a9e75d8 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -175,7 +175,7 @@ protected:
 private:
     DECL_LINK(EventListener, VclWindowEvent&, void);
     DECL_LINK(KeyEventListener, VclWindowEvent&, bool);
-    DECL_LINK(MouseEventListener, VclSimpleEvent&, void);
+    DECL_LINK(MouseEventListener, VclWindowEvent&, void);
     DECL_LINK(MnemonicActivateHdl, vcl::Window&, bool);
 
     static void DoRecursivePaint(vcl::Window* pWindow, const Point& rPos, OutputDevice& rOutput);
@@ -204,7 +204,7 @@ protected:
 
     virtual void HandleEventListener(VclWindowEvent& rEvent);
     virtual bool HandleKeyEventListener(VclWindowEvent& rEvent);
-    virtual void HandleMouseEventListener(VclSimpleEvent& rEvent);
+    virtual void HandleMouseEventListener(VclWindowEvent& rEvent);
 
 public:
     SalInstanceWidget(vcl::Window* pWidget, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
@@ -1143,7 +1143,7 @@ private:
     // in VclDrawingArea
     virtual void HandleEventListener(VclWindowEvent& rEvent) override;
 
-    virtual void HandleMouseEventListener(VclSimpleEvent& rEvent) override;
+    virtual void HandleMouseEventListener(VclWindowEvent& rEvent) override;
 
     virtual bool HandleKeyEventListener(VclWindowEvent& /*rEvent*/) override;
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e3fbde51e376..2b1908f55834 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -219,7 +219,8 @@ void SalInstanceWidget::ensure_mouse_listener()
 {
     if (!m_bMouseEventListener)
     {
-        Application::AddEventListener(LINK(this, SalInstanceWidget, MouseEventListener));
+        m_xWidget->AddEventListener(LINK(this, SalInstanceWidget, MouseEventListener));
+        m_xWidget->AddChildEventListener(LINK(this, SalInstanceWidget, MouseEventListener));
         m_bMouseEventListener = true;
     }
 }
@@ -517,7 +518,10 @@ SalInstanceWidget::~SalInstanceWidget()
     if (m_aMnemonicActivateHdl.IsSet())
         m_xWidget->SetMnemonicActivateHdl(Link<vcl::Window&, bool>());
     if (m_bMouseEventListener)
-        Application::RemoveEventListener(LINK(this, SalInstanceWidget, MouseEventListener));
+    {
+        m_xWidget->RemoveChildEventListener(LINK(this, SalInstanceWidget, MouseEventListener));
+        m_xWidget->RemoveEventListener(LINK(this, SalInstanceWidget, MouseEventListener));
+    }
     if (m_bKeyEventListener)
         Application::RemoveKeyListener(LINK(this, SalInstanceWidget, KeyEventListener));
     if (m_bEventListener)
@@ -611,11 +615,10 @@ MouseEvent TransformEvent(const MouseEvent& rEvent, const vcl::Window* pParent,
 }
 }
 
-void SalInstanceWidget::HandleMouseEventListener(VclSimpleEvent& rEvent)
+void SalInstanceWidget::HandleMouseEventListener(VclWindowEvent& rWinEvent)
 {
-    if (rEvent.GetId() == VclEventId::WindowMouseButtonDown)
+    if (rWinEvent.GetId() == VclEventId::WindowMouseButtonDown)
     {
-        auto& rWinEvent = static_cast<VclWindowEvent&>(rEvent);
         if (m_xWidget == rWinEvent.GetWindow())
         {
             const MouseEvent* pMouseEvent = static_cast<const MouseEvent*>(rWinEvent.GetData());
@@ -629,9 +632,8 @@ void SalInstanceWidget::HandleMouseEventListener(VclSimpleEvent& rEvent)
             m_aMousePressHdl.Call(aTransformedEvent);
         }
     }
-    else if (rEvent.GetId() == VclEventId::WindowMouseButtonUp)
+    else if (rWinEvent.GetId() == VclEventId::WindowMouseButtonUp)
     {
-        auto& rWinEvent = static_cast<VclWindowEvent&>(rEvent);
         if (m_xWidget == rWinEvent.GetWindow())
         {
             const MouseEvent* pMouseEvent = static_cast<const MouseEvent*>(rWinEvent.GetData());
@@ -645,9 +647,8 @@ void SalInstanceWidget::HandleMouseEventListener(VclSimpleEvent& rEvent)
             m_aMouseReleaseHdl.Call(aTransformedEvent);
         }
     }
-    else if (rEvent.GetId() == VclEventId::WindowMouseMove)
+    else if (rWinEvent.GetId() == VclEventId::WindowMouseMove)
     {
-        auto& rWinEvent = static_cast<VclWindowEvent&>(rEvent);
         if (m_xWidget == rWinEvent.GetWindow())
         {
             const MouseEvent* pMouseEvent = static_cast<const MouseEvent*>(rWinEvent.GetData());
@@ -691,7 +692,7 @@ IMPL_LINK(SalInstanceWidget, KeyEventListener, VclWindowEvent&, rEvent, bool)
     return HandleKeyEventListener(rEvent);
 }
 
-IMPL_LINK(SalInstanceWidget, MouseEventListener, VclSimpleEvent&, rEvent, void)
+IMPL_LINK(SalInstanceWidget, MouseEventListener, VclWindowEvent&, rEvent, void)
 {
     HandleMouseEventListener(rEvent);
 }
@@ -5913,7 +5914,7 @@ void SalInstanceDrawingArea::HandleEventListener(VclWindowEvent& rEvent)
     SalInstanceWidget::HandleEventListener(rEvent);
 }
 
-void SalInstanceDrawingArea::HandleMouseEventListener(VclSimpleEvent& rEvent)
+void SalInstanceDrawingArea::HandleMouseEventListener(VclWindowEvent& rEvent)
 {
     if (rEvent.GetId() == VclEventId::WindowMouseButtonDown
         || rEvent.GetId() == VclEventId::WindowMouseButtonUp