summaryrefslogtreecommitdiff
path: root/vcl/source/control/edit.cxx
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2020-08-24 17:18:03 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2020-08-25 14:16:24 +0200
commit2c9052802ea411dffbf5906c4914611fcbfbc6a5 (patch)
treee6770ee575093376968135484b373b8d85155927 /vcl/source/control/edit.cxx
parent041fd5a6b8c1f0002cfc693ef66daf28a86df371 (diff)
tdf#136094 Handle background color in drawNativeControl
Make gtk3's 'GtkSalGraphics::drawNativeControl' take into account a control's background color, if any is explicitly set: Set background/fill color (in 'Edit::ApplySettings') also for the case where the control is drawn "natively", but don't draw the background in the generic 'Window::Erase' method for the case of native drawing; instead handle it when drawing the control itself. This adds an additional parameter to pass the background color to the relevant '{d,D}rawNativeControl' methods (defaulting to 'COL_AUTO') and implements the required handling to apply the background color for the gtk3 case. qt5/kf5 will probably be handled in an upcoming commit as well. Windows as well as the "gen" VCL plugin were not affected by the issue, so remain unchanged and just ignore the new parameter. In a quick test on on macOS, the rendering of the controls in the sample doc was broken beyond just the missing background colors (s. screenshot attached to tdf#136094); the behavior there also remains unchanged by this patch, the new parameter is ignored for now. Change-Id: I01923a504fea2367ae96032104f09099e35f410e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101284 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/source/control/edit.cxx')
-rw-r--r--vcl/source/control/edit.cxx18
1 files changed, 12 insertions, 6 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 91ee92f89029..8d8bb1b43276 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -373,17 +373,23 @@ void Edit::ApplySettings(vcl::RenderContext& rRenderContext)
Color aTextColor = rStyleSettings.GetFieldTextColor();
ApplyControlForeground(rRenderContext, aTextColor);
- if (ImplUseNativeBorder(rRenderContext, GetStyle()))
+ if (IsControlBackground())
+ {
+ rRenderContext.SetBackground(GetControlBackground());
+ rRenderContext.SetFillColor(GetControlBackground());
+
+ if (ImplUseNativeBorder(rRenderContext, GetStyle()))
+ {
+ // indicates that no non-native drawing of background should take place
+ mpWindowImpl->mnNativeBackground = ControlPart::Entire;
+ }
+ }
+ else if (ImplUseNativeBorder(rRenderContext, GetStyle()))
{
// Transparent background
rRenderContext.SetBackground();
rRenderContext.SetFillColor();
}
- else if (IsControlBackground())
- {
- rRenderContext.SetBackground(GetControlBackground());
- rRenderContext.SetFillColor(GetControlBackground());
- }
else
{
rRenderContext.SetBackground(rStyleSettings.GetFieldColor());