Skip to content

Commit f764013

Browse files
janusbalJanus Balatbat
andauthored
Bug fixes: Textblock layout | Parsing warnings (#7041)
* need to take accoutn for empty * works but need to find memory leak * testing against stackedit * removing unneeded line | allocating array * clean up * getting rid of str() use from strigstream * handling link destination with [ character and other tokens * removing cpp changes Co-authored-by: Janus Balatbat <jsbalatbat@microsoft.com>
1 parent 1dcef8c commit f764013

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACOAdaptiveCard.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ + (ACOAdaptiveCardParseResult *)fromJson:(NSString *)payload;
6363
try {
6464
ACOAdaptiveCard *card = [[ACOAdaptiveCard alloc] init];
6565
std::shared_ptr<ParseResult> parseResult = AdaptiveCard::DeserializeFromString(std::string([payload UTF8String]), std::string("1.5"));
66-
NSMutableArray *acrParseWarnings;
66+
NSMutableArray *acrParseWarnings = [[NSMutableArray alloc] init];
6767
std::vector<std::shared_ptr<AdaptiveCardParseWarning>> parseWarnings = parseResult->GetWarnings();
6868
for (const auto &warning : parseWarnings) {
6969
ACRParseWarning *acrParseWarning = [[ACRParseWarning alloc] initWithParseWarning:warning];

source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRColumnView.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ - (void)configureWidthOfView:(UIView *)view
5252
}
5353

5454
[view setContentHuggingPriority:priority forAxis:UILayoutConstraintAxisHorizontal];
55-
[view setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal];
55+
[view setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
5656
[self setContentHuggingPriority:priority forAxis:UILayoutConstraintAxisHorizontal];
5757
[self setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal];
5858
// if columnWidth is set to stretch or number, allow column to fill the available space

0 commit comments

Comments
 (0)