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

8211999: Window positioning bugs due to overlapping GraphicsDevice bounds (Windows/HiDPI) #494

Closed
wants to merge 4 commits into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Oct 7, 2021

Backport of JDK-8211999. Applies almost cleanly. I had to integrate hunks in WRobotPeer.java and Robot.java manually.


Progress

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

Issue

  • JDK-8211999: Window positioning bugs due to overlapping GraphicsDevice bounds (Windows/HiDPI)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 494

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 7, 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 be635258fa0b7c25441ab23ff9ec0f86655dc5ca 8211999: Window positioning bugs due to overlapping GraphicsDevice bounds (Windows/HiDPI) Oct 7, 2021
@openjdk
Copy link

openjdk bot commented Oct 7, 2021

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 7, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 7, 2021

Webrevs

@mrserb
Copy link
Member

mrserb commented Oct 7, 2021

Let me test this for a day or two.

@TheRealMDoerr
Copy link
Contributor Author

Excellent! Thanks for testing!

@mrserb
Copy link
Member

mrserb commented Oct 11, 2021

Looks like at least one new test fails because of a compilation error due to switch expression:

WindowSizeDifferentScreens\\WindowSizeDifferentScreens.java:110: error: illegal start of expression
            default -> throw new IllegalArgumentException("Unexpected: " + top);
                    ^
9 errors
result: Failed. Compilation failed: Compilation failed
test result: Failed. Compilation failed: Compilation failed

public boolean useAbsoluteCoordinates() {
return true;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be inserted in the same place as in the jdk repo.

@openjdk openjdk bot removed the rfr Pull request is ready for review label Oct 11, 2021
@TheRealMDoerr
Copy link
Contributor Author

Thank you for looking at it! Fully agreed. I've moved useAbsoluteCoordinates() down where it matches the upstream version better and I've fixed the switch expression in the test for jdk11. The test compiles on my machine, but I can't run it because of missing "XTEST extension version 2.2".

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 11, 2021
@mrserb
Copy link
Member

mrserb commented Oct 12, 2021

I'll rerun the tests.

@mrserb
Copy link
Member

mrserb commented Oct 14, 2021

Looks fine.

@openjdk
Copy link

openjdk bot commented Oct 14, 2021

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

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

8211999: Window positioning bugs due to overlapping GraphicsDevice bounds (Windows/HiDPI)

Reviewed-by: serb

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 31 new commits pushed to the master branch:

  • 94893a5: 8274840: Update OS detection code to recognize Windows 11
  • 596677e: 8251155: HostIdentifier fails to canonicalize hostnames starting with digits
  • b3926db: 8233638: [TESTBUG] Swing test ScreenMenuBarInputTwice.java fails on macos
  • 4bdcad5: 8233643: [TESTBUG] JMenu test bug4515762.java fails on macos
  • dfb97b0: 8233642: [TESTBUG] JMenuBar test bug 4750590.java fails on macos
  • 167c9f0: 8169953: JComboBox/8057893: ComboBoxEdited event is not fired! on Windows
  • 968c21e: 8272574: C2: assert(false) failed: Bad graph detected in build_loop_late
  • 90d1bcb: 8261071: AArch64: Refactor interpreter native wrappers
  • 15931e5: 8230228: [TESTBUG] Several runtime/ErrorHandling tests may fail on some platforms
  • 15384ad: 8250888: nsk/jvmti/scenarios/general_functions/GF08/gf08t001/TestDriver.java fails
  • ... and 21 more: https://git.openjdk.java.net/jdk11u-dev/compare/63367e324b02ca4fb5a542dc3c3ec4cdc568c4c0...master

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 Pull request is ready to be integrated label Oct 14, 2021
@TheRealMDoerr
Copy link
Contributor Author

Thanks a lot for reviewing and testing!
/integrate

@openjdk
Copy link

openjdk bot commented Oct 15, 2021

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

  • 99ff268: 8239334: Tab Size does not work correctly in JTextArea with setLineWrap on
  • e2f8301: 8273790: Potential cyclic dependencies between Gregorian and CalendarSystem
  • 94893a5: 8274840: Update OS detection code to recognize Windows 11
  • 596677e: 8251155: HostIdentifier fails to canonicalize hostnames starting with digits
  • b3926db: 8233638: [TESTBUG] Swing test ScreenMenuBarInputTwice.java fails on macos
  • 4bdcad5: 8233643: [TESTBUG] JMenu test bug4515762.java fails on macos
  • dfb97b0: 8233642: [TESTBUG] JMenuBar test bug 4750590.java fails on macos
  • 167c9f0: 8169953: JComboBox/8057893: ComboBoxEdited event is not fired! on Windows
  • 968c21e: 8272574: C2: assert(false) failed: Bad graph detected in build_loop_late
  • 90d1bcb: 8261071: AArch64: Refactor interpreter native wrappers
  • ... and 23 more: https://git.openjdk.java.net/jdk11u-dev/compare/63367e324b02ca4fb5a542dc3c3ec4cdc568c4c0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 15, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 15, 2021
@openjdk
Copy link

openjdk bot commented Oct 15, 2021

@TheRealMDoerr Pushed as commit fcb396f.

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

@TheRealMDoerr TheRealMDoerr deleted the 8211999_Windows branch October 15, 2021 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants