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.

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

8237469: Inherited styles don't update when node is moved #87

Closed
wants to merge 4 commits into from
Closed

8237469: Inherited styles don't update when node is moved #87

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e69640
8237469: CssStyleHelper reuse check fixed
DeanWookey Jan 17, 2020
0749dde
8237469: Fixed whitespace issues
DeanWookey Jan 17, 2020
782f55e
8237469: Moved firstStyleableAncestor call to before canReuseStyleHel…
DeanWookey Jan 22, 2020
c7e60b9
8237469: Removed extra year in copyright header
DeanWookey Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -131,7 +131,7 @@ static CssStyleHelper createStyleHelper(final Node node) {
}
node.styleHelper.cacheContainer.forceSlowpath = true;
node.styleHelper.triggerStates.addAll(triggerStates[0]);
node.styleHelper.firstStyleableAncestor = findFirstStyleableAncestor(node);
kevinrushforth marked this conversation as resolved.
Show resolved Hide resolved

updateParentTriggerStates(node, depth, triggerStates);
return node.styleHelper;

Expand Down Expand Up @@ -318,7 +318,8 @@ private static boolean canReuseStyleHelper(final Node node, final StyleMap style
if (parent == null) {
return true;
}

//update ancestor since this node may have changed positions in the scene graph (JDK-8237469)
node.styleHelper.firstStyleableAncestor = findFirstStyleableAncestor(node);
CssStyleHelper parentHelper = getStyleHelper(node.styleHelper.firstStyleableAncestor);

if (parentHelper != null && parentHelper.cacheContainer != null) {
Expand Down