vcl/osx/salframe.cxx | 38 ++------------------------------------
1 file changed, 2 insertions(+), 36 deletions(-)
New commits:
commit 55a0fba06086436260aca1f7367da376683afdaa
Author: Patrick Luby <plub...@neooffice.org>
AuthorDate: Mon Nov 6 08:31:41 2023 -0500
Commit: Patrick Luby <plub...@neooffice.org>
CommitDate: Mon Nov 6 18:28:44 2023 +0100
tdf#155266 revert commit 9c0803edd1f42b2d29115674795c7c674fea1a35
While commit 9c0803edd1f42b2d29115674795c7c674fea1a35 fixed tdf#155266
on Mac Silicon, it didn't fix that bug on Mac Intel.
Change-Id: I4dc9eb3a5da319a0c8f58bcdea5abfc3e4ec4a0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158997
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plub...@neooffice.org>
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 211b288f3b79..d20e6e3d8422 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1018,24 +1018,7 @@ void AquaSalFrame::Flush()
// outside of the application's event loop (e.g. IntroWindow)
// nothing would trigger paint event handling
// => fall back to synchronous painting
- bool bFlush = ( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 );
-
- // tdf#155266 flush when scrolling or dragging
- // Delaying flushing until the dispatch level returns to zero causes
- // scrolling via the scrollwheel or mouse drag to appear laggy and
- // jerky.
- if( !bFlush )
- {
- NSEvent *pEvent = [NSApp currentEvent];
- if ( pEvent )
- {
- NSEventType nType = [pEvent type];
- if ( nType == NSEventTypeScrollWheel || nType ==
NSEventTypeLeftMouseDragged )
- bFlush = true;
- }
- }
-
- if( bFlush )
+ if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
{
mpGraphics->Flush();
[mpNSView display];
@@ -1056,24 +1039,7 @@ void AquaSalFrame::Flush( const tools::Rectangle& rRect )
// outside of the application's event loop (e.g. IntroWindow)
// nothing would trigger paint event handling
// => fall back to synchronous painting
- bool bFlush = ( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 );
-
- // tdf#155266 flush when scrolling or dragging
- // Delaying flushing until the dispatch level returns to zero causes
- // scrolling via the scrollwheel or mouse drag to appear laggy and
- // jerky.
- if( !bFlush )
- {
- NSEvent *pEvent = [NSApp currentEvent];
- if ( pEvent )
- {
- NSEventType nType = [pEvent type];
- if ( nType == NSEventTypeScrollWheel || nType ==
NSEventTypeLeftMouseDragged )
- bFlush = true;
- }
- }
-
- if( bFlush )
+ if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
{
mpGraphics->Flush( rRect );
[mpNSView display];
