mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#126042 measure text width with the bold font it will render with

Browse Source 
Change-Id: I81cc0351e652c632bd85efa6dacb36be66fcfb3c
Reviewed-on: https://gerrit.libreoffice.org/78385
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-09-02 10:02:46 +01:00
parent 51f312c136
commit 1485bcc796
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx
View File

@@ -444,11 +444,11 @@ void ExtensionBox_Impl::DrawRow(vcl::RenderContext& rRenderContext, const tools:
nMaxTitleWidth -= nLinkWidth + (2 * SPACE_BETWEEN); nMaxTitleWidth -= nLinkWidth + (2 * SPACE_BETWEEN);
} }
long aVersionWidth = rRenderContext.GetTextWidth(rEntry->m_sVersion); long aVersionWidth = rRenderContext.GetTextWidth(rEntry->m_sVersion);
long aTitleWidth = rRenderContext.GetTextWidth(rEntry->m_sTitle) + (aTextHeight / 3);
aPos = rRect.TopLeft() + Point(ICON_OFFSET, TOP_OFFSET); aPos = rRect.TopLeft() + Point(ICON_OFFSET, TOP_OFFSET);
rRenderContext.SetFont(aBoldFont); rRenderContext.SetFont(aBoldFont);
long aTitleWidth = rRenderContext.GetTextWidth(rEntry->m_sTitle) + (aTextHeight / 3);
if (aTitleWidth > nMaxTitleWidth - aVersionWidth) if (aTitleWidth > nMaxTitleWidth - aVersionWidth)
{ {
aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3); aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3);