From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 25 Nov 2022 11:44:56 +0000 (+0100)
Subject: Stephan has checked that caching is still needed on macOS
X-Git-Tag: 2.4-beta2~335^2~2
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=cd5fe091d27decb34a5969e114687956cbbfd254;p=lyx.git

Stephan has checked that caching is still needed on macOS

Basically removing the cache makes getTextLayout 17x more expensive on
a simple test of scrolling through the Tutorial.
---

diff --git a/TODO.killqt4 b/TODO.killqt4
index 07cca2beeb..a79d0ebef2 100644
--- a/TODO.killqt4
+++ b/TODO.killqt4
@@ -1,5 +1,4 @@
 Things left to do after killing Qt4 (obtained by grepping for Qt4 and 'Qt 4'):
-* look at the FIXME KILLQT4 comments in src/ and resolve them
 * update INSTALL.cmake
 * update INSTALL.MacOSX
 * update cmake
diff --git a/src/frontends/qt/GuiFontMetrics.cpp b/src/frontends/qt/GuiFontMetrics.cpp
index b3bdac6f73..a48523089f 100644
--- a/src/frontends/qt/GuiFontMetrics.cpp
+++ b/src/frontends/qt/GuiFontMetrics.cpp
@@ -84,7 +84,8 @@ int const breakstr_cache_max_cost = 10 * 1024 * 1024;
 // Qt 5.x already has its own caching of QTextLayout objects
 // but it does not seem to work well on MacOS X.
 #if defined(Q_OS_MAC)
-//FIXME KILLQT4: check wether setting the cache to 0 hurts on macOS
+// For some reason, the built-in cache of QTextLayout does not work or
+// exist on macOS.
 // Limit qtextlayout_cache_ size to 500 elements (we do not know the
 // size of the QTextLayout objects anyway).
 int const qtextlayout_cache_max_size = 500;