Skip to content

Revieve linear gradients and opacity PR #493

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 79 commits into from
Apr 14, 2025
Merged

Revieve linear gradients and opacity PR #493

merged 79 commits into from
Apr 14, 2025

Conversation

OndrejSpanel
Copy link
Contributor

Attempt to revive #22

It works fine in my fork, it "just" needs resolving possible conflicts.

OndrejSpanel and others added 30 commits December 3, 2018 17:58
@OndrejSpanel
Custom version id.
0d0e8ee
@OndrejSpanel
Add dispose for each create.
49838d1
@OndrejSpanel
Implement splash rounder corners using CSS instead of an image.
eedc960
@OndrejSpanel
Add slow layout demonstration (rounder corners).
edae11d
@OndrejSpanel
Rounded corners without borders added twice into the path because of …
9faaf60 
…bad starting angle.

This has caused significant performance issues in awt Area constructor sometimes.
@OndrejSpanel
Rounded corners demo + performance fix.
a3bb384
@OndrejSpanel
Gamatron version deployed.
a6f8ba4
@OndrejSpanel
Fix gamatron repository settings for release deploy.
5cd70c1
@OndrejSpanel
Enable text AA by default.
e5d6c83
@OndrejSpanel
Prepare adding some CSS3 properties to the parser. Based on the impro…
8b9822f 
…vements by lvostinar's fork.
@OndrejSpanel
Added setOpacity to the output device. Implemented basic opacity and …
d74e48c 
…rgba-color support in PDF outputdevice.
@OndrejSpanel
Added proper font-weight and font-style handling with @font-face rule.
133de56
@OndrejSpanel
Opacity render fix: Recursively calculate opacity values to account f…
64cf7ae 
…or nested opacities.
@OndrejSpanel
CSS3 improvement: Take word-wrap property into account.
3c78ae1
@OndrejSpanel
Add a StackingContext for elements with opacity values smaller than 1.
91b49a2
@OndrejSpanel
Opacity values are NOT_INHERITED. Fixes a bug when combining nesting …
00eafec 
…with different opacities and z-index values.
@OndrejSpanel
Set border-radius properties builders to implemented = false.
f9f94d5
@OndrejSpanel
Prepare adding some CSS3 properties to the parser. Based on the impro…
0c7cb6d 
…vements by lvostinar's fork.
@OndrejSpanel
Added setOpacity to the output device. Implemented basic opacity and …
f945787 
…rgba-color support in PDF outputdevice.
@OndrejSpanel
Added proper font-weight and font-style handling with @font-face rule.
52ac0ba
@OndrejSpanel
Add a StackingContext for elements with opacity values smaller than 1.
7b1a23b
@OndrejSpanel
Opacity values are NOT_INHERITED. Fixes a bug when combining nesting …
8831443 
…with different opacities and z-index values.
@OndrejSpanel
Set border-radius properties builders to implemented = false.
0ce47ba
@OndrejSpanel
Set display:block on generatedContent in BoxBuilder: Resolves ClassCa…
d655162 
…stException for grid layouts.
@OndrejSpanel
Add .DS_Store to gitignore.
4b93a32
@OndrejSpanel
Check for tableRow, tableSection, tableCell etc.
7084696
@OndrejSpanel
Only set a new PdfGState if the opacity changes.
301f4c6
@OndrejSpanel
Revert opacity StackingContext. Should be done differently.
cfe994d
@OndrejSpanel
Prepare adding some CSS3 properties to the parser. Based on the impro…
6f75c0d 
…vements by lvostinar's fork.
@OndrejSpanel
Added setOpacity to the output device. Implemented basic opacity and …
2394223 
…rgba-color support in PDF outputdevice.
dependabot bot and others added 7 commits August 30, 2022 16:43
@dependabot @OndrejSpanel
Bump junit from 4.10 to 4.13.1 in /flying-saucer-core
4a7d7a2 
Bumps [junit](https://github.com/junit-team/junit4) from 4.10 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.10.md)
- [Commits](junit-team/junit4@r4.10...r4.13.1)

---
updated-dependencies:
- dependency-name: junit:junit
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @OndrejSpanel
Bump itextpdf from 5.3.0 to 5.5.12 in /flying-saucer-fop
4429810 
Bumps [itextpdf](https://github.com/itext/itextpdf) from 5.3.0 to 5.5.12.
- [Release notes](https://github.com/itext/itextpdf/releases)
- [Commits](itext/itextpdf@5.3.0...5.5.12)

---
updated-dependencies:
- dependency-name: com.itextpdf:itextpdf
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
@OndrejSpanel
Ver.9.1.21-opengrabeso
b1a9951
@OndrejSpanel
Ver.9.1.21-opengrabeso
87ccdde
@OndrejSpanel
Merge tag 'v9.11.6' into dev
b93dff0 
# Conflicts:
#	flying-saucer-core/pom.xml
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/constants/IdentValue.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/constants/Idents.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/constants/ValueConstants.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/newmatch/CascadedStyle.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/newmatch/Selector.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/CSSParser.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/FSFunction.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/FSRGBColor.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/property/Conversions.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/parser/property/PrimitivePropertyBuilders.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/sheet/FontFaceRule.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/css/style/CalculatedStyle.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/extend/OutputDevice.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/layout/BoxBuilder.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/layout/Layer.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/layout/SharedContext.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/render/AbstractOutputDevice.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/render/BorderPainter.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/Java2DOutputDevice.java
#	flying-saucer-core/src/main/java/org/xhtmlrenderer/util/GeneralUtil.java
#	flying-saucer-examples/pom.xml
#	flying-saucer-fop/pom.xml
#	flying-saucer-log4j/pom.xml
#	flying-saucer-pdf-itext5/pom.xml
#	flying-saucer-pdf-itext5/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java
#	flying-saucer-pdf-osgi/pom.xml
#	flying-saucer-pdf/pom.xml
#	flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextFontResolver.java
#	flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java
#	flying-saucer-swt-examples/pom.xml
#	flying-saucer-swt/pom.xml
#	flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java
#	pom.xml
@OndrejSpanel
Update Java version
31a3452
@OndrejSpanel
Merge branch 'main' into opengrabeso-fixes
a667f62
@OndrejSpanel
Copy link
Contributor Author

Demo screenshot:

image

@asolntsev
Copy link
Contributor

@OndrejSpanel Thank you for the contribution.
Implementing CSS3 features is a valuable direction for FS.
What's your plan? Going to resolve those conflicts?

@OndrejSpanel
Copy link
Contributor Author

I think conflict are already resolved, I will recheck if everything works as intended and then ask for review.

@OndrejSpanel OndrejSpanel force-pushed the opengrabeso-fixes branch 2 times, most recently from d8efd19 to 93465d5 Compare April 13, 2025 07:53
@OndrejSpanel
Copy link
Contributor Author

I think it should be ready now. If it makes review or merging easier, I could prepare a squashed version.

@OndrejSpanel OndrejSpanel marked this pull request as ready for review April 13, 2025 07:59
@OndrejSpanel
Copy link
Contributor Author

Note: my effort concentrates on Graphics2D rendering. While opacity seems to be implemented for PDF, I did not test it. The drawLinearGradient function in ITextOutputDevice is just a stub. I do not use the PDF functionality and I am not familiar with necessary APIs. If anyone want to see this, feel free to take over.

@asolntsev
Copy link
Contributor

@OndrejSpanel Well... I personally don't care about Graphics2D, I use FlyingSaucer to generate PDFs.
So I can just trust your PR and merge it. :)

Usually I prefer to rebase PR, but in this case this option is not available because of conflicts:
image

So what do you prefer, should we squash all 70 commits into one, or is it better to create a merge commit?
image

@OndrejSpanel OndrejSpanel mentioned this pull request Apr 14, 2025
Closed
@OndrejSpanel
Copy link
Contributor Author

So what do you prefer, should we squash all 70 commits into one, or is it better to create a merge commit?

For me it doesn't really matter. I have also prepared #496 in case it is easier for you (commit authorship lost, but I doubt anyone would care about that).

@OndrejSpanel
Copy link
Contributor Author

I use FlyingSaucer to generate PDFs.

Regarding PDF support: while gradients are not implemented in the PDF backend, they should not be difficult to add if anyone is interested. And the opacity should already work, only I did not test it for PDFs.

@asolntsev asolntsev added this to the 9.11.7 milestone Apr 14, 2025
@asolntsev asolntsev self-assigned this Apr 14, 2025
@asolntsev asolntsev merged commit 13be69c into flyingsaucerproject:main Apr 14, 2025
4 checks passed
@asolntsev
Copy link
Contributor

@OndrejSpanel Thank you. After looking at the PR, I decided to merge the original PR - let's keep its history. In case of any troubles, it will be easier to investigate and understand why some changes were done.

asolntsev added a commit that referenced this pull request Apr 14, 2025
@asolntsev
change version from 9.11.7 to 9.12.0
d070c35 
PRs #493, #492, #497 contain significant changes, let's release a major version.
@OndrejSpanel OndrejSpanel deleted the opengrabeso-fixes branch April 14, 2025 21:33
@ledfordtj
Copy link

ledfordtj commented Apr 30, 2025 •
edited
Loading

@asolntsev did the PDF support for linear gradient get added before this was merged? This package works amazing for my use case, except I need linear gradient support for PDFs as well. I am happy to help out where I can, but I think I will need some direction.

@asolntsev
Copy link
Contributor

No, I think PDF support was not implemented.
You are welcome. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@asolntsev asolntsev

Labels
feature
Projects
None yet
Milestone
9.12.0
Development

Successfully merging this pull request may close these issues.
5 participants
@OndrejSpanel @asolntsev @ledfordtj @danfickle @cneijenhuis