From 433fce6571d4b9121374047324a7d2d2722ac3e4 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 7 Sep 2018 16:33:28 +0200 Subject: vcl: less text layout calls in ListBox Number of GenericSalLayout::LayoutText() calls during Writer startup at this call-site: 1068 -> 614. Change-Id: I3bef56e550294a6b2c9fe73c0c6531249c9f1f30 Reviewed-on: https://gerrit.libreoffice.org/60164 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- vcl/source/control/imp_listbox.cxx | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'vcl/source/control/imp_listbox.cxx') diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index 0655b74c6d8e..629d1609fbfc 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -601,6 +601,27 @@ struct ImplEntryMetrics long nImgHeight; }; +SalLayoutGlyphs* ImplEntryType::GetTextGlyphs(OutputDevice* pOutputDevice) +{ + if (!maStrGlyphs.empty()) + // Use pre-calculated result. + return &maStrGlyphs; + + std::unique_ptr pLayout = pOutputDevice->ImplLayout( + maStr, 0, maStr.getLength(), Point(0, 0), 0, nullptr, SalLayoutFlags::GlyphItemsOnly); + if (!pLayout) + return nullptr; + + const SalLayoutGlyphs* pGlyphs = pLayout->GetGlyphs(); + if (!pGlyphs) + return nullptr; + + // Remember the calculation result. + maStrGlyphs = *pGlyphs; + + return &maStrGlyphs; +} + void ImplListBoxWindow::EnableQuickSelection( bool b ) { maQuickSelectionEngine.SetEnabled( b ); @@ -637,7 +658,9 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry ) else { // normal single line case - aMetrics.nTextWidth = static_cast(GetTextWidth( rEntry.maStr )); + const SalLayoutGlyphs* pGlyphs = rEntry.GetTextGlyphs(this); + aMetrics.nTextWidth + = static_cast(GetTextWidth(rEntry.maStr, 0, -1, nullptr, pGlyphs)); if( aMetrics.nTextWidth > mnMaxTxtWidth ) mnMaxTxtWidth = aMetrics.nTextWidth; aMetrics.nEntryWidth = mnMaxTxtWidth; -- cgit v1.2.3