Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8251377: [macos11] JTabbedPane selected tab text is barely legible #198

Closed

Conversation

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Aug 5, 2021

Backport of JDK-8251377. Doesn't apply cleanly because Mac OS version check from JDK-8230869 is not in 11u. I just included the introduction of isCatalinaOrAbove and isBigSurOrAbove from the latter. Rest applies cleanly.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8251377: [macos11] JTabbedPane selected tab text is barely legible

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/198/head:pull/198
$ git checkout pull/198

Update a local copy of the PR:
$ git checkout pull/198
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/198/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 198

View PR using the GUI difftool:
$ git pr show -t 198

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/198.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 5, 2021

👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 3f67afd3a8c642f33ca58a9881dff4c81f83e821 8251377: [macos11] JTabbedPane selected tab text is barely legible Aug 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 5, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Aug 5, 2021
@TheRealMDoerr TheRealMDoerr marked this pull request as ready for review Aug 5, 2021
@openjdk openjdk bot added the rfr label Aug 5, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 5, 2021

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

This backport looks fine.

@openjdk
Copy link

@openjdk openjdk bot commented Aug 9, 2021

@TheRealMDoerr This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8251377: [macos11] JTabbedPane selected tab text is barely legible

Reviewed-by: shade

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 11 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Aug 9, 2021
@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Sep 2, 2021

Thanks for the review!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 2, 2021

Going to push as commit ea1a1d86b92e43bbb4ecadf4ba3bd338b3441ad4.
Since your change was applied there have been 101 commits pushed to the master branch:

  • 9a5ba0b: 7179006: [macosx] Print-to-file doesn't work: printing to the default printer instead
  • d41b37f: 8263362: Avoid division by 0 in java/awt/font/TextJustifier.java justify
  • 0ea1e0f: 8272902: Bump update version for OpenJDK: jdk-11.0.14
  • 63fc945: 8248668: AArch64: Avoid MIN/MAX macros when using MSVC
  • 9719270: 8248666: AArch64: Use THREAD_LOCAL instead of __thread
  • c816276: 8241336: Some java.net tests failed with NoRouteToHostException on MacOS with special network configuration
  • 910e24b: 8212718: Refactor some annotation processor tests to better use collections
  • 5792854: 8212695: Add explicit timeout to several HTTP Client tests
  • e5ec679: 8211325: test/jdk/java/net/Socket/LingerTest.java fails with cleaning up
  • 7100a65: 8169246: java/net/DatagramSocket/ReportSocketClosed.java fails intermittently with BindException
  • ... and 91 more: https://git.openjdk.java.net/jdk11u-dev/compare/1223b5830f4a3e58243af79b888575c12a004462...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 2, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 2, 2021

@TheRealMDoerr Pushed as commit ea1a1d8.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@TheRealMDoerr TheRealMDoerr deleted the 8251377_JTabbedPane branch Sep 2, 2021
@mrserb
Copy link
Member

@mrserb mrserb commented Sep 3, 2021

I am not sure why did you add the "isMacOSXCatalinaOrAbove" since it is unused in the fix and was not part of the fix in the mainline?

BTW I think you would like to backport https://bugs.openjdk.java.net/browse/JDK-8269984 as well it fixes a regression of this one.

@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Sep 3, 2021

isMacOSXBigSurOrAbove() from JDK-8230869 is needed for this change. The Catalina function was just in the same hunk.
Right, I'm planning to backport JDK-8269984, too. There are still a few macOS fixes missing in OpenJDK 11u.

@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Sep 3, 2021

See #310. Note that these changes are for 11.0.14, now. We should check if we need them in 11.0.13.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants