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

Fix ASTextNode2 is accessing backgroundColor off main while sizing / layout is happening #794

Merged
merged 1 commit into from
Feb 8, 2018

Conversation

maicki
Copy link
Contributor

@maicki maicki commented Feb 7, 2018

Fixes #767

We can add the background only if we really prepare the attributed string only for drawing. We are calculating the layout without background color now and use it for sizing of the node that in the end will draw the attributed string with background color. Background color should not the influence the size though.

@ghost
Copy link

ghost commented Feb 7, 2018

🚫 CI failed with log

@ghost
Copy link

ghost commented Feb 7, 2018

2 Warnings
⚠️ Any source code changes should have an entry in CHANGELOG.md or have #trivial in their title.
⚠️ Please ensure license is correct for ASTextNode2.mm:

//
//  ASTextNode2.mm
//  Texture
//
//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
//  This source code is licensed under the BSD-style license found in the
//  LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
//  grant of patent rights can be found in the PATENTS file in the same directory.
//
//  Modifications to this file made after 4/13/2017 are: Copyright (c) through the present,
//  Pinterest, Inc.  Licensed under the Apache License, Version 2.0 (the "License");
//  you may not use this file except in compliance with the License.
//  You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//

    

Generated by 🚫 Danger

Copy link
Member

@Adlai-Holler Adlai-Holler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good fix 👍

@maicki maicki merged commit 600b6cb into master Feb 8, 2018
maicki added a commit that referenced this pull request Feb 8, 2018
@jinlee
Copy link

jinlee commented Feb 8, 2018

awesome! 👍

@appleguy appleguy deleted the MSFixTextNode2IsAccessingBackgroundColorOffMain branch February 9, 2018 19:29
bernieperez pushed a commit to AtomTickets/Texture that referenced this pull request Apr 25, 2018
bernieperez pushed a commit to AtomTickets/Texture that referenced this pull request Apr 25, 2018
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.

None yet

3 participants