diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 12:06:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 13:46:25 +0200 |
| commit | bbb1975d9c56b410023580a0e5fe95ed3e43496b (patch) | |
| tree | 92f29de2cdc5b1d5e52d8497543e1b47aad15d14 /vcl | |
| parent | aec9462c1fc0fdc7437b69399cef5f3711301105 (diff) | |
convert WB_FORCECTRLBACKGROUND to bool field on Edit
Change-Id: I7a8731635bd22926df98cd70c8bb850408c1854c
Reviewed-on: https://gerrit.libreoffice.org/43076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/edit.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 96e4eb76962d..8edf98b274e1 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -282,6 +282,7 @@ void Edit::ImplInitEditData() mbClickedInSelection = false; mbActivePopup = false; mbIsSubEdit = false; + mbForceControlBackground = false; mpDDInfo = nullptr; mpIMEInfos = nullptr; mcEchoChar = 0; @@ -512,7 +513,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const tools::Rectangl rRenderContext.SetTextColor(rStyleSettings.GetDisableColor()); // Set background color of the normal text - if ((GetStyle() & WB_FORCECTRLBACKGROUND) != 0 && IsControlBackground()) + if (mbForceControlBackground && IsControlBackground()) { // check if we need to set ControlBackground even in NWF case rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); @@ -584,7 +585,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const tools::Rectangl // Set background color when part of the text is selected if (ImplUseNativeBorder(rRenderContext, GetStyle())) { - if( (GetStyle() & WB_FORCECTRLBACKGROUND) != 0 && IsControlBackground() ) + if( mbForceControlBackground && IsControlBackground() ) rRenderContext.SetTextFillColor(GetControlBackground()); else rRenderContext.SetTextFillColor(); |