diff options
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index eb092d16c51f..1b9f0bfdb0f9 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -763,12 +763,30 @@ return; if (bFont) { - GetDataWindow().ApplyControlFont(GetDataWindow(), rStyleSettings.GetFieldFont()); + vcl::Font aFont = rStyleSettings.GetFieldFont(); + if (IsControlFont()) + { + GetDataWindow().SetControlFont(GetControlFont()); + aFont.Merge(GetControlFont()); + } + else + GetDataWindow().SetControlFont(); + + GetDataWindow().SetZoomedPointFont(GetDataWindow(), aFont); } if (bFont || bForeground) { - GetDataWindow().ApplyControlForeground(GetDataWindow(), rStyleSettings.GetFieldTextColor()); + Color aTextColor = rStyleSettings.GetFieldTextColor(); + if (IsControlForeground()) + { + aTextColor = GetControlForeground(); + GetDataWindow().SetControlForeground(aTextColor); + } + else + GetDataWindow().SetControlForeground(); + + GetDataWindow().SetTextColor( aTextColor ); } if (!bBackground) // FIXME: Outside of Paint Hierarchy |