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

8287912: GTK L&F : Background of tree icons are red #10112

Closed
wants to merge 5 commits into from

Conversation

kumarabhi006
Copy link
Contributor

@kumarabhi006 kumarabhi006 commented Sep 1, 2022

The background of tree icons are not red in GTK LAF when setOpaque is set to false for tree component.
It has been observed that while painting tree cell background in GTK LAF, a rectangular area is also painted with background color (white).

Proposed solution is to check the opacity of tree component before drawing tree cell background. If the opacity is set to "false" then the background shouldn't be painted.

An automated test case has been added and checked in CI, link is added in JBS.


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-8287912: GTK L&F : Background of tree icons are red

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10112

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 1, 2022

👋 Welcome back kumarabhi006! 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
Copy link

openjdk bot commented Sep 1, 2022

@kumarabhi006 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.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Sep 1, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 1, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 1, 2022

Webrevs

@@ -0,0 +1,112 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

remove this empty line


if (c.equals(Color.RED)) {
passed = true;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

better to check at midpoint tree.width/2, tree.height/2 and also break if it's RED, no need to check all pixels.

Copy link
Contributor

Choose a reason for hiding this comment

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

Another possible solution that I used in a previous test was a midpoint as suggested, but also one pixel near each edge. This eliminates the chance of the red still existing but not being detected at the midpoint because the red is at a different location.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The test check has been changed to compare the pixels of entire width keeping the height constant to half of tree height. Now it will check pixel color and if it is not red , the test will fail.

Copy link
Contributor

Choose a reason for hiding this comment

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

For me, test is not failing without the fix.
Also, if you test entire width and fail if it is not red, it might encounter black pixel of text font too and might fail, so I think it's better to check width/2 to width -1 and not entire width.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, it's might be better to write the image in case of failure so that it gives an idea why it failed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For me, test is not failing without the fix. Also, if you test entire width and fail if it is not red, it might encounter black pixel of text font too and might fail, so I think it's better to check width/2 to width -1 and not entire width.

Test was not failing without the fix because the second argument of getRGB method is height/2, and for that pixel value the returned color is red.
Changing the argument from height/2 to height/4 will fail the test without the fix otherwise it will pass the test.

Also writing the image in case of failure.

Copy link
Contributor

Choose a reason for hiding this comment

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

This looks ok .Please remove the empty 1st line in the test.

}
}
}
if (!passed) {
Copy link
Member

Choose a reason for hiding this comment

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

This test will pass even in the case of last pixel check is RED. We should check for pixel data and whenever it is not RED we should bail out.

Also if test fails it will leave TreeBackgroundColorTestFail.png, we should use temporary file and delete it on exit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have removed the writing of test image in case of fail operation and test condition changed to check if pixel color is not red then test will fail.

@openjdk
Copy link

openjdk bot commented Sep 6, 2022

@kumarabhi006 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:

8287912: GTK L&F : Background of tree icons are red

Reviewed-by: psadhukhan, jdv

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

  • 272745b: 8293340: Remove unused _code in {Zero,Template}InterpreterGenerator
  • 26f2a97: 8290561: Coalesce incubator-module warnings for single-file source-code programs
  • 8e22f2b: 8293361: GHA: dump config.log in case of configure failure
  • b17758a: 8247283: Enable the new conformant preprocessor option in Visual Studio
  • 1bed23a: 8293353: [BACKOUT] G1: Remove redundant is-marking-active checks in C1 barrier
  • 4955835: 8282434: Leading combining diacritic character in string renders incorrectly
  • ef20ffe: 8293159: Use try-with-resources in X11FontManager.registerFontDir
  • 056ed48: 8293180: JQuery UI license file not updated
  • dbb2c4b: 8288897: Clean up node dump code
  • 9833c02: 8292946: GC lock/jni/jnilock001 test failed "assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed()) failed: Twice in a row"
  • ... and 741 more: https://git.openjdk.org/jdk/compare/ac6be165196457a26d837760b5f5030fe010d633...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@prsadhuk, @jayathirthrao) 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 the ready Pull request is ready to be integrated label Sep 6, 2022
@kumarabhi006
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 6, 2022
@openjdk
Copy link

openjdk bot commented Sep 6, 2022

@kumarabhi006
Your change (at version 930a7fb) is now ready to be sponsored by a Committer.

@jayathirthrao
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 6, 2022

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

  • 272745b: 8293340: Remove unused _code in {Zero,Template}InterpreterGenerator
  • 26f2a97: 8290561: Coalesce incubator-module warnings for single-file source-code programs
  • 8e22f2b: 8293361: GHA: dump config.log in case of configure failure
  • b17758a: 8247283: Enable the new conformant preprocessor option in Visual Studio
  • 1bed23a: 8293353: [BACKOUT] G1: Remove redundant is-marking-active checks in C1 barrier
  • 4955835: 8282434: Leading combining diacritic character in string renders incorrectly
  • ef20ffe: 8293159: Use try-with-resources in X11FontManager.registerFontDir
  • 056ed48: 8293180: JQuery UI license file not updated
  • dbb2c4b: 8288897: Clean up node dump code
  • 9833c02: 8292946: GC lock/jni/jnilock001 test failed "assert(gch->gc_cause() == GCCause::_scavenge_alot || !gch->incremental_collection_failed()) failed: Twice in a row"
  • ... and 741 more: https://git.openjdk.org/jdk/compare/ac6be165196457a26d837760b5f5030fe010d633...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 6, 2022
@openjdk openjdk bot closed this Sep 6, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Sep 6, 2022
@openjdk
Copy link

openjdk bot commented Sep 6, 2022

@jayathirthrao @kumarabhi006 Pushed as commit a92c1ff.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants