diff options
| author | Thorsten Wagner <thorsten.wagner.4@gmail.com> | 2020-07-28 00:36:07 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-08-27 12:55:40 +0200 |
| commit | 84b2849512bdb19597739d9515dd55e2d3ba9504 (patch) | |
| tree | d29d62f69e2f525654c5248fb699a034ca8c3990 | |
| parent | fb3d929466e4e54b29d2558b403991c9c2cf4d3f (diff) | |
tdf#134708 Text coloring of buttons within forms amended
Change-Id: I55f91ff626a55ab588ac49a085070c0d9f919e68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99564
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | vcl/source/control/button.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 49dd0c204dbb..531315a09233 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -752,6 +752,13 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice *pDev, DrawFlags nDrawFl if (nDrawFlags & DrawFlags::Mono) aColor = COL_BLACK; + // Custom foreground color is reasonable on stock controls only. Stock controls are used if a custom background has been set + // (and thus no native controls are able to be used) or no native controls are available. + + else if (IsControlForeground() + && (IsControlBackground() || !IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Entire))) + aColor = GetControlForeground(); + // Button types with possibly different text coloring are flat buttons and regular buttons. Regular buttons may be action // buttons and may have an additional default status. Moreover all buttons may have an additional pressed and rollover // (highlight) status. Pressed buttons are always in rollover status. |