backport - [TIMOB-14144] moved defer control rendering flag to not collide with size property #102
Conversation
This file contains 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
Conflicts: src/tibb/NativeControlObject.cpp
Conflicts: src/tibb/NativeControlObject.cpp
Conflicts: src/tibb/NativeAbstractTextControlObject.cpp src/tibb/NativeControlObject.h
This also fixes a layout bug with the text controls not being sized to fit their wrapper container. Now if the text control is wider than the text you will see the alignment you set with "textAlign" property. [TIMOB-11739] Conflicts: src/tibb/NativeAbstractTextControlObject.cpp
mtnlife999
pushed a commit
that referenced
this pull request
Jun 13, 2013
backport - [TIMOB-14144] moved defer control rendering flag to not collide with size property
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.
No description provided.