From ef2aa884a89c731a337ab769c01e1feacea48034 Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Wed, 15 Jul 2026 06:18:39 +0200 Subject: [PATCH] Revert "tdf#172399 skip redrawing of old surface during live resize" This reverts commit 2a7e219bea2db9d5ff5c025178001e1e404d83f2. Reason for revert: I was finally able to reproduce the bug and this patch didn't fix the bug. Apparently, the bug only occurs when the notebook bar is used with Skia/Metal. Why the notebook bar keeps moving around with Skia/Metal but not Skia/Raster is now the mystery that needs to be solved. Change-Id: I36dbb296d1737f6f7d24b0b9a478a4614ef4db5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208131 Tested-by: Jenkins Reviewed-by: Patrick Luby --- vcl/skia/gdiimpl.cxx | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index 18e35bf834eb..ad92dbdcb380 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -52,10 +52,6 @@ #include #include -#ifdef MACOSX -#include -#endif - using namespace SkiaHelper; namespace @@ -559,22 +555,8 @@ void SkiaSalGraphicsImpl::checkSurface() sk_sp snapshot; if (!isOffscreen()) { -#ifdef MACOSX - // tdf#172399 skip redrawing of old surface during live resize - // During live resize on macOS, there is a flood of resize - // events in quick succession so not only are most of the - // newly created surfaces short lived, but preserving and - // redrawing the original content drawn to the old surface - // is unnecessary since AquaSalFrame::SendPaintEvent() is - // is called after each resize event. - if (!ImplGetSVData()->mpWinData->mbIsLiveResize) - { -#endif - flushDrawing(); - snapshot = makeCheckedImageSnapshot(mSurface); -#ifdef MACOSX - } -#endif + flushDrawing(); + snapshot = makeCheckedImageSnapshot(mSurface); } destroySurface();