JDK-8297449: Update JInternalFrame Metal Border code #11305

honkar-jdk · 2022-11-23T00:46:57Z

Updated Metal Border code for JInternalFrame.

Added instanceof check before casting Graphics to G2D.
Replaced roundHalfDown with Region.clipRound()

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8297449: Update JInternalFrame Metal Border code

Reviewers

Alexey Ivanov (@aivanov-jdk - Reviewer)
Alexander Zuev (@azuev-java - Reviewer) ⚠️ Review applies to b1e3557a

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11305/head:pull/11305
$ git checkout pull/11305

Update a local copy of the PR:
$ git checkout pull/11305
$ git pull https://git.openjdk.org/jdk pull/11305/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11305

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11305.diff

bridgekeeper · 2022-11-23T00:47:58Z

👋 Welcome back honkar! 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 · 2022-11-23T00:51:08Z

@honkar-jdk The following label will be automatically applied to this pull request:

client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2022-11-23T00:54:14Z

Webrevs

aivanov-jdk · 2022-11-23T22:40:34Z

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java

-            for (int i = 0; i <= thickness; i++) {
-                g.drawRect(i, i, width - (i * 2), height - (i * 2));
-            }
+            if (g instanceof Graphics2D) {


I think it's not the right approach. You should separate the parts of code into those which require Graphics2D (resetting transform, stroke width) and those which don't, so that the border is still painted even when g is not an instance of Graphics2D.

Take a look at how @alisenchung handled it for EtchedBorder:

jdk/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java

Lines 159 to 171 in b42c1ad

if (g instanceof Graphics2D) {

Graphics2D g2d = (Graphics2D) g;

at = g2d.getTransform();

oldStk = g2d.getStroke();

// if m01 or m10 is non-zero, then there is a rotation or shear

// skip resetting the transform

resetTransform = (at.getShearX() == 0) && (at.getShearY() == 0);

if (resetTransform) {

g2d.setTransform(new AffineTransform());

stkWidth = (int) Math.floor(Math.min(at.getScaleX(), at.getScaleY()));

g2d.setStroke(new BasicStroke((float) stkWidth));

}

}

The border is still rendered even if the passed in Graphics is not Graphics2D.

@aivanov-jdk Makes sense. Thanks for reviewing. Will check and make the necessary code changes.

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java

aivanov-jdk · 2022-11-29T20:21:25Z

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java

                at = g2d.getTransform();
+                scaleFactor = at.getScaleX();
                oldColor = g2d.getColor();


Color wasn't preserved before JDK-8015739.

Getting and setting the color doesn't require Graphics2D, so, if it's to be preserved, it should be preserved outside of instanceof.

@aivanov-jdk Updated the code. Removed color preservation code to match previous code (before JDK-8015739 changes).

openjdk · 2022-11-30T19:48:46Z

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8297449: Update JInternalFrame Metal Border code

Reviewed-by: aivanov, kizune

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

9f94cbe: 8271519: java/awt/event/SequencedEvent/MultipleContextsFunctionalTest.java failed with "Total [200] - Expected [400]"
c70d1e1: 8296710: Update to use jtreg 7.1
4899d78: 8293294: Remove dead code in Parse::check_interpreter_type
5459b11: 8297033: G1: Improve logging for Remembered Sets
c6156f9: 8297561: Redundant index check in String.offsetByCodePoints()
eec24aa: 8295350: JFR: Add stop methods for recording streams
9430f3e: 8297934: [BACKOUT] Compiler should only use verified interface types for optimization
2cb64a7: 8294943: Implement record patterns in enhanced for
fc9d419: 8297928: Update jdk.internal.javac.PreviewFeature.Feature to reflect JEP 432 and JEP 433
b60cce6: 8297118: Change IncompatibleClassChangeError to MatchException for exhaustive switch statements and switch expressions
... and 140 more: https://git.openjdk.org/jdk/compare/fb6c992f325981c42c7f75109a6c9db7ca8715d8...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.

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java

honkar-jdk · 2022-12-01T18:56:52Z

/integrate

openjdk · 2022-12-01T18:58:07Z

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

9f94cbe: 8271519: java/awt/event/SequencedEvent/MultipleContextsFunctionalTest.java failed with "Total [200] - Expected [400]"
c70d1e1: 8296710: Update to use jtreg 7.1
4899d78: 8293294: Remove dead code in Parse::check_interpreter_type
5459b11: 8297033: G1: Improve logging for Remembered Sets
c6156f9: 8297561: Redundant index check in String.offsetByCodePoints()
eec24aa: 8295350: JFR: Add stop methods for recording streams
9430f3e: 8297934: [BACKOUT] Compiler should only use verified interface types for optimization
2cb64a7: 8294943: Implement record patterns in enhanced for
fc9d419: 8297928: Update jdk.internal.javac.PreviewFeature.Feature to reflect JEP 432 and JEP 433
b60cce6: 8297118: Change IncompatibleClassChangeError to MatchException for exhaustive switch statements and switch expressions
... and 140 more: https://git.openjdk.org/jdk/compare/fb6c992f325981c42c7f75109a6c9db7ca8715d8...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-12-01T18:58:26Z

@honkar-jdk Pushed as commit 0962957.

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

honkar-jdk added 2 commits November 22, 2022 16:38

JIF MetalBorder update

0f606f8

removed unused import

0e7e7e7

openjdk bot added the rfr Pull request is ready for review label Nov 23, 2022

openjdk bot added the client client-libs-dev@openjdk.org label Nov 23, 2022

aivanov-jdk suggested changes Nov 23, 2022

View reviewed changes

review changes

5f019df

SWinxy reviewed Nov 28, 2022

View reviewed changes

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java Show resolved Hide resolved

added scaleFactor

a3afba4

aivanov-jdk reviewed Nov 29, 2022

View reviewed changes

review changes

b1e3557

azuev-java approved these changes Nov 30, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 30, 2022

aivanov-jdk approved these changes Dec 1, 2022

View reviewed changes

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java Outdated Show resolved Hide resolved

minor change

042f949

aivanov-jdk approved these changes Dec 1, 2022

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Dec 1, 2022

openjdk bot closed this Dec 1, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8297449: Update JInternalFrame Metal Border code #11305

JDK-8297449: Update JInternalFrame Metal Border code #11305

honkar-jdk commented Nov 23, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 23, 2022

openjdk bot commented Nov 23, 2022

mlbridge bot commented Nov 23, 2022 •

edited

Loading

aivanov-jdk Nov 23, 2022

honkar-jdk Nov 23, 2022 •

edited

Loading

aivanov-jdk Nov 29, 2022

honkar-jdk Nov 29, 2022

openjdk bot commented Nov 30, 2022 •

edited

Loading

honkar-jdk commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

	if (g instanceof Graphics2D) {
	Graphics2D g2d = (Graphics2D) g;
	at = g2d.getTransform();
	oldStk = g2d.getStroke();
	// if m01 or m10 is non-zero, then there is a rotation or shear
	// skip resetting the transform
	resetTransform = (at.getShearX() == 0) && (at.getShearY() == 0);
	if (resetTransform) {
	g2d.setTransform(new AffineTransform());
	stkWidth = (int) Math.floor(Math.min(at.getScaleX(), at.getScaleY()));
	g2d.setStroke(new BasicStroke((float) stkWidth));
	}
	}

JDK-8297449: Update JInternalFrame Metal Border code #11305

JDK-8297449: Update JInternalFrame Metal Border code #11305

Conversation

honkar-jdk commented Nov 23, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 23, 2022

openjdk bot commented Nov 23, 2022

mlbridge bot commented Nov 23, 2022 • edited Loading

Webrevs

aivanov-jdk Nov 23, 2022

Choose a reason for hiding this comment

honkar-jdk Nov 23, 2022 • edited Loading

Choose a reason for hiding this comment

aivanov-jdk Nov 29, 2022

Choose a reason for hiding this comment

honkar-jdk Nov 29, 2022

Choose a reason for hiding this comment

openjdk bot commented Nov 30, 2022 • edited Loading

honkar-jdk commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

openjdk bot commented Dec 1, 2022

honkar-jdk commented Nov 23, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 23, 2022 •

edited

Loading

honkar-jdk Nov 23, 2022 •

edited

Loading

openjdk bot commented Nov 30, 2022 •

edited

Loading