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

Sync with master #11

Merged
merged 21 commits into from
Sep 20, 2019
Merged

Sync with master #11

merged 21 commits into from
Sep 20, 2019

Conversation

rh101
Copy link
Owner

@rh101 rh101 commented Sep 20, 2019

No description provided.

minggo and others added 21 commits July 30, 2019 15:15
…ildren (#20007)

* searchFromParent shouldn't search from grand children
* remove redundant copy constructor and destructor
This patch fixes an issue that if both // (recursive enumeration)
and .. (starting from parent node) are specified,
Node::enumerateChildren does not honor the latter and starts searching
from current node rather than parent node.
After movig font atlas `reinit()` (#19384) there was indused a problem: the first display of text with a outline in the label does not update line height. This is because the atlas `reinit()` does not occur when the outline is activated. In this case, a new atlas will be created, but the line height will not be taken from it, because line height calculate in `updateContent()`. I propose line height calculating to return to the font atlas constructor.
Fix include order for Win32.
@rh101 rh101 merged commit 03c7479 into rh101:v3 Sep 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.