anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor GuiFontMetrics::getLayout

Browse Source 
This allows to create a new version that takes an already built
TextLayoutHelper struct as parameter.

No intended change.

See discussion in bug #10117.
This commit is contained in:
Jean-Marc Lasgouttes 2022-07-14 17:24:33 +02:00
parent 201c95a76e
commit 7fdc604606
2 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/frontends/qt/GuiFontMetrics.cpp
View File

@ -352,8 +352,6 @@ uint qHash(TextLayoutKey const & key)
}
namespace {
// This holds a translation table between the original string and the
// QString that we can use with QTextLayout.
struct TextLayoutHelper
@ -438,8 +436,49 @@ TextLayoutHelper::TextLayoutHelper(docstring const & s, bool isrtl, bool naked)
//LYXERR0("TLH: " << dump.replace(word_joiner, "|").toStdString());
}
namespace {
shared_ptr<QTextLayout>
getTextLayout_helper(TextLayoutHelper const & tlh, double const wordspacing,
QFont font)
{
auto const ptl = make_shared<QTextLayout>();
ptl->setCacheEnabled(true);
font.setWordSpacing(wordspacing);
ptl->setFont(font);
#ifdef BIDI_USE_FLAG
/* Use undocumented flag to enforce drawing direction
* FIXME: This does not work with Qt 5.11 (ticket #11284).
*/
ptl->setFlags(tlh.rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight);
#endif
ptl->setText(tlh.qstr);
ptl->beginLayout();
ptl->createLine();
ptl->endLayout();
return ptl;
}
}
shared_ptr<QTextLayout const>
GuiFontMetrics::getTextLayout(TextLayoutHelper const & tlh,
double const wordspacing) const
{
PROFILE_THIS_BLOCK(getTextLayout_TLH);
TextLayoutKey key{tlh.docstr, tlh.rtl, wordspacing};
if (auto ptl = qtextlayout_cache_[key])
return ptl;
PROFILE_CACHE_MISS(getTextLayout_TLH);
auto const ptl = getTextLayout_helper(tlh, wordspacing, font_);
qtextlayout_cache_.insert(key, ptl);
return ptl;
}
shared_ptr<QTextLayout const>
GuiFontMetrics::getTextLayout(docstring const & s, bool const rtl,
double const wordspacing) const
@ -449,28 +488,8 @@ GuiFontMetrics::getTextLayout(docstring const & s, bool const rtl,
if (auto ptl = qtextlayout_cache_[key])
return ptl;
PROFILE_CACHE_MISS(getTextLayout);
auto const ptl = make_shared<QTextLayout>();
ptl->setCacheEnabled(true);
QFont copy = font_;
copy.setWordSpacing(wordspacing);
ptl->setFont(copy);
#ifdef BIDI_USE_FLAG
/* Use undocumented flag to enforce drawing direction
* FIXME: This does not work with Qt 5.11 (ticket #11284).
*/
ptl->setFlags(rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight);
#endif
#ifdef BIDI_USE_OVERRIDE
ptl->setText(bidi_override[rtl] + toqstr(s));
#else
ptl->setText(toqstr(s));
#endif
ptl->beginLayout();
ptl->createLine();
ptl->endLayout();
TextLayoutHelper tlh(s, rtl);
auto const ptl = getTextLayout_helper(tlh, wordspacing, font_);
qtextlayout_cache_.insert(key, ptl);
return ptl;
}

9
src/frontends/qt/GuiFontMetrics.h
View File

@ -27,6 +27,8 @@
namespace lyx {
namespace frontend {
struct TextLayoutHelper;
struct BreakStringKey
{
bool operator==(BreakStringKey const & key) const {
@ -97,14 +99,17 @@ public:
/// Return a pointer to a cached QTextLayout object
std::shared_ptr<QTextLayout const>
getTextLayout(docstring const & s, bool const rtl,
double const wordspacing) const;
getTextLayout(docstring const & s, bool const rtl, double const wordspacing) const;
private:
Breaks breakString_helper(docstring const & s, int first_wid, int wid,
bool rtl, bool force) const;
/// A different version of getTextLayout for internal use
std::shared_ptr<QTextLayout const>
getTextLayout(TextLayoutHelper const & tlh, double const wordspacing) const;
/// The font
QFont font_;