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:02:52 +0200 |
| commit | ebd7af9aebb5b76255aa299dd8047cb4266215a4 (patch) | |
| tree | d69139f2251876d7f5f0bf5ad56192cdfa3c3ee7 | |
| parent | 29411e7c08ec249116ee0211888e47c8b6f57707 (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/78605
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 4c18207e0844..91141d35cc4e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -795,16 +795,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) |