vcl/source/control/button.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 84b2849512bdb19597739d9515dd55e2d3ba9504
Author: Thorsten Wagner <thorsten.wagne...@gmail.com>
AuthorDate: Tue Jul 28 00:36:07 2020 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Aug 27 12:55:40 2020 +0200
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 <qui...@gmail.com>
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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
