Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: ios/chrome/browser/ui/uikit_ui_util.mm

Issue 2778073002: Adding VisualConstraintsWithMetricsAndOptions() (Closed)
Patch Set: Merge + fix Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ui/uikit_ui_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/uikit_ui_util.mm
diff --git a/ios/chrome/browser/ui/uikit_ui_util.mm b/ios/chrome/browser/ui/uikit_ui_util.mm
index 6c9308aeb02af884b2fe02a90a9e75e4c45ff185..f0542c5fe7df7d9a562a4fc49e55c90a34670345 100644
--- a/ios/chrome/browser/ui/uikit_ui_util.mm
+++ b/ios/chrome/browser/ui/uikit_ui_util.mm
@@ -570,17 +570,8 @@ void ApplyVisualConstraintsWithMetricsAndOptions(
NSDictionary* subviewsDictionary,
NSDictionary* metrics,
NSLayoutFormatOptions options) {
- NSMutableArray* layoutConstraints =
- [NSMutableArray arrayWithCapacity:constraints.count * 3];
- for (NSString* constraint in constraints) {
- DCHECK([constraint isKindOfClass:[NSString class]]);
- [layoutConstraints addObjectsFromArray:
- [NSLayoutConstraint
- constraintsWithVisualFormat:constraint
- options:options
- metrics:metrics
- views:subviewsDictionary]];
- }
+ NSArray* layoutConstraints = VisualConstraintsWithMetricsAndOptions(
+ constraints, subviewsDictionary, metrics, options);
[NSLayoutConstraint activateConstraints:layoutConstraints];
}
@@ -594,6 +585,31 @@ void ApplyVisualConstraintsWithMetricsAndOptions(
metrics, options);
}
+NSArray* VisualConstraintsWithMetrics(NSArray* constraints,
+ NSDictionary* subviewsDictionary,
+ NSDictionary* metrics) {
+ return VisualConstraintsWithMetricsAndOptions(constraints, subviewsDictionary,
+ metrics, 0);
+}
+
+NSArray* VisualConstraintsWithMetricsAndOptions(
+ NSArray* constraints,
+ NSDictionary* subviewsDictionary,
+ NSDictionary* metrics,
+ NSLayoutFormatOptions options) {
+ NSMutableArray* layoutConstraints = [NSMutableArray array];
+ for (NSString* constraint in constraints) {
+ DCHECK([constraint isKindOfClass:[NSString class]]);
+ [layoutConstraints addObjectsFromArray:
+ [NSLayoutConstraint
+ constraintsWithVisualFormat:constraint
+ options:options
+ metrics:metrics
+ views:subviewsDictionary]];
+ }
+ return [layoutConstraints copy];
+}
+
void AddSameCenterConstraints(UIView* view1, UIView* view2) {
AddSameCenterXConstraint(view1, view2);
AddSameCenterYConstraint(view1, view2);
« no previous file with comments | « ios/chrome/browser/ui/uikit_ui_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698