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

8247564: Lanai - SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0 #68

Closed
wants to merge 2 commits into from

Conversation

@dekonoplyov
Copy link
Contributor

dekonoplyov commented Jul 28, 2020

DrawLine implementation same as in OGLRenderer.c
It fixes JList borders and helps with lines inside radio buttons.


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8247564: Lanai - SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0

Reviewers

Download

$ git fetch https://git.openjdk.java.net/lanai pull/68/head:pull/68
$ git checkout pull/68

@bridgekeeper bridgekeeper bot added the oca label Jul 28, 2020
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 28, 2020

Hi @dekonoplyov, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user dekonoplyov" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@dekonoplyov
Copy link
Contributor Author

dekonoplyov commented Jul 28, 2020

/covered

@bridgekeeper bridgekeeper bot added the oca-verify label Jul 28, 2020
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 28, 2020

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@dekonoplyov dekonoplyov changed the title 8247564: SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0 8247564: Lanai - SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0 ⚠️ Title mismatch between PR and JBS. Jul 28, 2020
@dekonoplyov dekonoplyov changed the title 8247564: Lanai - SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0 ⚠️ Title mismatch between PR and JBS. 8247564: Lanai - SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0 Jul 28, 2020
@openjdk
Copy link

openjdk bot commented Jul 30, 2020

@dekonoplyov this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout drawline
git fetch https://git.openjdk.java.net/lanai master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push
@mlbridge
Copy link

mlbridge bot commented Jul 30, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Jul 30, 2020

@dekonoplyov This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

8247564: Lanai - SwingSet2 - Motif L&F - UI controls border is incorrectly drawn with uiScale=1.0

Reviewed-by: aghaisas
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 15 commits pushed to the master branch:

  • b01b4ed: 8244402: Lanai - Motif L&F - Non selected Radio button is barely rendered on non-retina display
  • 7954d97: 8248831: Lanai : SwingSet2Demo Input dialog is not proper for MetalLookAndFeel with default non-retina display
  • 21b0695: Automatic merge of client:master into master
  • 954e32d: 8233635: [TESTBUG] ProgressMonitorEscapeKeyPress.java fails on macos
  • cb7bd4b: Automatic merge of client:master into master
  • d2a9c11: 8250755: Better cleanup for jdk/test/javax/imageio/plugins/shared/CanWriteSequence.java
  • fe28c1d: 8250843: [Lanai] Back out changes done in JDK-8250778
  • a057120: 8250778: [Lanai] Primitives rendered with metal on non-retina monitor are different as compared to OpenGL
  • a5c3460: 8249659: [Lanai] Crash while running RenderPerfTest with metal pipeli…
  • 74618f7: Automatic merge of client:master into master
  • ... and 5 more: https://git.openjdk.java.net/lanai/compare/1969c3448db786648db6e4299ddd0b10d9690a2c...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate b01b4ed2d9532058261e9a8fd717375e6b33de6c.

As you are not a known OpenJDK Author, an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@aghaisas) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready and removed merge-conflict labels Jul 30, 2020
@dekonoplyov
Copy link
Contributor Author

dekonoplyov commented Jul 31, 2020

/integrate

@openjdk openjdk bot added the sponsor label Jul 31, 2020
@openjdk
Copy link

openjdk bot commented Jul 31, 2020

@dekonoplyov
Your change (at version 4ebb86b) is now ready to be sponsored by a Committer.

@aghaisas
Copy link
Collaborator

aghaisas commented Jul 31, 2020

/sponsor

@openjdk openjdk bot closed this Jul 31, 2020
@openjdk openjdk bot added integrated and removed sponsor ready rfr labels Jul 31, 2020
@openjdk
Copy link

openjdk bot commented Jul 31, 2020

@aghaisas @dekonoplyov The following commits have been pushed to master since your change was applied:

  • b01b4ed: 8244402: Lanai - Motif L&F - Non selected Radio button is barely rendered on non-retina display
  • 7954d97: 8248831: Lanai : SwingSet2Demo Input dialog is not proper for MetalLookAndFeel with default non-retina display
  • 21b0695: Automatic merge of client:master into master
  • 954e32d: 8233635: [TESTBUG] ProgressMonitorEscapeKeyPress.java fails on macos
  • cb7bd4b: Automatic merge of client:master into master
  • d2a9c11: 8250755: Better cleanup for jdk/test/javax/imageio/plugins/shared/CanWriteSequence.java
  • fe28c1d: 8250843: [Lanai] Back out changes done in JDK-8250778
  • a057120: 8250778: [Lanai] Primitives rendered with metal on non-retina monitor are different as compared to OpenGL
  • a5c3460: 8249659: [Lanai] Crash while running RenderPerfTest with metal pipeli…
  • 74618f7: Automatic merge of client:master into master
  • f38fb70: 8146451: javax/swing/JComponent/4337267/bug4337267.java failed on Windows
  • 0fa3c6a: Automatic merge of client:master into master
  • 7a904f3: 8169959: javax/swing/JTable/6263446/bug6263446.java: Table should be editing
  • b74b492: Automatic merge of client:master into master
  • 08469db: 8246742: ServiceUI.printDialog does not support properties dialog

Your commit was automatically rebased without conflicts.

Pushed as commit b9e0d7c.

@dekonoplyov dekonoplyov deleted the dekonoplyov:drawline branch Sep 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.