diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-28 14:34:17 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2017-12-19 12:26:23 +0100 |
| commit | d157eb5469348d2aeccfd405fd20b013ca6e7761 (patch) | |
| tree | ccd96cd85c8fc2a31396bdafef0f6864c783d85d /svtools | |
| parent | 6ca469e0d53c0ab81765c4dc41f73bc3bc5c6d36 (diff) | |
Resolves: tdf#112656 don't reset to default font if a custom font was set
the list has been laid out with the smaller custom font, including
calculating the bounding box of the entry, then rendered with the
default larger font
Change-Id: I2ae569c9857d4e1016cbf55da4c3334c63dcf5f6
Reviewed-on: https://gerrit.libreoffice.org/42910
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 3043863d688c5bbd5101ebd5ddd8a9452e05ca50)
Reviewed-on: https://gerrit.libreoffice.org/43031
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit f9c6022d109062d9b13339463f363892b2439d7d)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 988c59dbbf03..b7a220a131d7 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3593,12 +3593,9 @@ void SvTreeListBox::StateChanged( StateChangedType eType ) void SvTreeListBox::ApplySettings(vcl::RenderContext& rRenderContext) { - const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); - vcl::Font aFont; - aFont = rStyleSettings.GetFieldFont(); - aFont.SetColor(rStyleSettings.GetWindowTextColor()); - SetPointFont(rRenderContext, aFont); + SetPointFont(rRenderContext, GetPointFont(*this)); + const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); rRenderContext.SetTextColor(rStyleSettings.GetFieldTextColor()); rRenderContext.SetTextFillColor(); rRenderContext.SetBackground(rStyleSettings.GetFieldColor()); |