Fix: Remove imports from css and use a list of stylesheets instead #745
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
Fixes #744
Long story short: the
@import "com/sun.../modena.css
in the css files weren't working (even before the modular changes from #720), asnew URL("com.../modena.css
)` wasn't being resolved at all.This also means that
CSSInternal::getThemeStyleClasses
didn't work at all, because URL("com/....css") is not a valid URL.This PR moves those CSS imports into code, as a list of different stylesheets used by each theme works (because Javafx-graphics/CSS uses the URLConverter and produces the correct URL(with the right file://javafx.controls.jar!...css path).
Also, CSSInternal::getThemeStyleClasses now uses a class from javafx-controls, so
getResource
returns a valid URL.As a result themes are working now:
Progress