Make style sheets cascade #2977
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70e138c to
0a08673
Compare
c5eb5a8 to
660a324
Compare
660a324 to
74e970a
Compare
So it is no longer required in the base style.
Just like HTML.
We need it for caching anyway.
danyeaw
approved these changes
Jan 5, 2024
There was a problem hiding this comment.
This looks like a nice improvement, thanks @amolenaar!
I merged main to resolve a merge conflict. However, mypy isn't happy since the node argument to compute_node is getting a PseudoStyleNode, and importing it from the styling module creates a circular import.
|
I'm not done yet :) |
e514b44 to
d5c7758
Compare
a247295 to
5720afa
Compare
Assign one CompiledStyleSheet per diagram, so style caches can be invalidated when a diagram is updated.
So that we can just iterate and apply in the right order
69733ac to
2e25cac
Compare
Now that styles are inherited, assigning a color will also assign it to the diagram. Since color is an inherited property, it will automatically be assigned to all items.
2e25cac to
42d485c
Compare
In case text-color is not defined.
|
@danyeaw I think it's ready for review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a follow-up PR on #2969.
PR Type
What kind of change does this PR introduce?
What is the current behavior?
Currently, every item on the diagram is a root item, even if it's contained in another item
Issue Number: #3023
What is the new behavior?
:roothas been fixed. Refers to the top-level diagram. (Note that there's also a DiagramItem, which is referred to as diagram!):has()and:empty)CssNodes.compile_style_sheet()output. The function now makes sure the rules are in ascending order.coloras color iftext-coloris not defined.text-coloris deprecated.Does this PR introduce a breaking change?
Other information
The
gaphor.core.modeling.diagram.StyledItemclass now depends on the interface ofgaphor.diagram.shapes.CssNode. This is not so clean, but can be fixed by implementing a protocol in the future.