vcl/source/control/button.cxx | 10 ----------
1 file changed, 10 deletions(-)
New commits:
commit ab5da884b16aa54aab8e9773a6e8dbf24e752c36
Author: Xisco Faulí <xiscofa...@libreoffice.org>
AuthorDate: Wed Sep 4 16:22:10 2019 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Sep 5 05:08:43 2019 +0200
tdf#125610: Revert "tdf#125088 Make button text white for blue buttons on
macOS"
This reverts commit 89775fd396e413daaf0e71710211075450bdc0ed.
Change-Id: I0ddbd454e53bcd442fdf2330661136e041c7d260
Reviewed-on: https://gerrit.libreoffice.org/78611
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 15f80be207b6..146b6402a7f4 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -812,16 +812,6 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice*
pDev, DrawFlags nDrawFl
if ( nDrawFlags & DrawFlags::Mono )
aColor = COL_BLACK;
-#ifdef MACOSX
- else if ((nButtonFlags & DrawButtonFlags::Default) && !(GetStyle() &
WB_FLATBUTTON))
- {
- // Make text color white if the button is a default control on macOS.
- // Without this you get a button with a blue background and blue text
- // which stands out as not looking right on macOS where default buttons
- // have white text and a blue background.
- aColor = COL_WHITE;
- }
-#endif
else if( (nButtonFlags & DrawButtonFlags::Highlight) &&
IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Entire) )
{
if (nButtonFlags & DrawButtonFlags::Pressed)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
