core.git: Branch 'libreoffice-24-8' - vcl/osx

[Patrick Luby (via logerrit)]

 vcl/osx/saltimer.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 32cac262affc67c3b1fdbf482fa361cd91385809
Author:     Patrick Luby <guibmac...@gmail.com>
AuthorDate: Sat Jan 4 09:23:07 2025 -0500
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Jan 6 05:03:45 2025 +0100

    tdf#164564 don't stop the timer while waiting for a native event
    
    Partially revert commit 62baf23796132d6c0e17ae1ff37c3b9ee0556cf0.
    If only ImplGetSVData()->mpWinData->mbIsWaitingForNativeEvent is
    true, stopping the timer will also stop animation when using
    Skia/Raster or Skia is disabled.
    
    Change-Id: I1d267625c4213687a5b98d0b073e8c9c345c2978
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179775
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>
    Tested-by: Jenkins

diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index fffd1c63b92c..9dc6c6d43f29 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -142,7 +142,11 @@ void AquaSalTimer::callTimerCallback()
 
 void AquaSalTimer::handleTimerElapsed()
 {
-    if ( m_bDirectTimeout || ImplGetSVData()->mpWinData->mbIsLiveResize || 
ImplGetSVData()->mpWinData->mbIsWaitingForNativeEvent )
+    // tdf#164564 don't stop the timer while waiting for a native event
+    // If only ImplGetSVData()->mpWinData->mbIsWaitingForNativeEvent is
+    // true, stopping the timer will also stop animation when using
+    // Skia/Raster or Skia is disabled.
+    if ( m_bDirectTimeout || ImplGetSVData()->mpWinData->mbIsLiveResize )
     {
         // Stop the timer, as it is just invalidated after the firing function
         Stop();