summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-09-28 14:34:17 +0100
committerTomaž Vajngerl <quikee@gmail.com>2017-10-01 10:26:53 +0200
commit3043863d688c5bbd5101ebd5ddd8a9452e05ca50 (patch)
tree6b130fffb95e9a5549b9acbe12143b565fe3822b
parent53e6d0a087318ad5a72885ab71396eb489641814 (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>
-rw-r--r--svtools/source/contnr/treelistbox.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 1264a1a9f745..beaeb7a7beeb 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3548,12 +3548,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());