diff options
| author | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-09-04 16:22:10 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-09-05 05:08:43 +0200 |
| commit | ab5da884b16aa54aab8e9773a6e8dbf24e752c36 (patch) | |
| tree | 2a4ff6abdd3f6aa9ccd7de0430574c1efeeea5e2 | |
| parent | 1fc306203b047e79d5b3f30cf615609f80b62fe4 (diff) | |
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 <fitojb@ubuntu.com>
| -rw-r--r-- | vcl/source/control/button.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
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) |