From b443e30959c601630166f9e2fee015a3efbac441 Mon Sep 17 00:00:00 2001 From: Sergey Demchenko Date: Thu, 27 Nov 2025 11:05:35 -0800 Subject: [PATCH] Use autolayout in sample app. --- MSAL/IdentityCore | 2 +- MSAL/test/app/mac/Base.lproj/Main.storyboard | 1268 ++++++++--------- .../app/mac/MSALAcquireTokenViewController.m | 18 +- 3 files changed, 645 insertions(+), 643 deletions(-) diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore index a1d10d5caf..ed47c1b521 160000 --- a/MSAL/IdentityCore +++ b/MSAL/IdentityCore @@ -1 +1 @@ -Subproject commit a1d10d5caf12d91648bbde6c1fbe113acb621079 +Subproject commit ed47c1b521c043e7e7576fca0a9431128aa8a5a5 diff --git a/MSAL/test/app/mac/Base.lproj/Main.storyboard b/MSAL/test/app/mac/Base.lproj/Main.storyboard index b3fa35d7ab..8c873586b3 100644 --- a/MSAL/test/app/mac/Base.lproj/Main.storyboard +++ b/MSAL/test/app/mac/Base.lproj/Main.storyboard @@ -3,7 +3,6 @@ - @@ -734,691 +733,691 @@ - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + - + @@ -1431,7 +1430,6 @@ - diff --git a/MSAL/test/app/mac/MSALAcquireTokenViewController.m b/MSAL/test/app/mac/MSALAcquireTokenViewController.m index 6db7532046..23b42c2a43 100644 --- a/MSAL/test/app/mac/MSALAcquireTokenViewController.m +++ b/MSAL/test/app/mac/MSALAcquireTokenViewController.m @@ -56,7 +56,7 @@ @interface MSALAcquireTokenViewController () @property (atomic, weak) IBOutlet NSTextField *extraQueryParamsTextField; @property (atomic, weak) IBOutlet NSSegmentedControl *webViewSegment; @property (atomic, weak) IBOutlet NSSegmentedControl *validateAuthoritySegment; -@property (atomic, weak) IBOutlet NSStackView *acquireTokenView; +@property (atomic, weak) IBOutlet NSView *acquireTokenView; @property (atomic, weak) IBOutlet NSPopUpButton *userPopup; @property (atomic, weak) IBOutlet NSSegmentedControl *authSchemeSegment; @@ -76,18 +76,22 @@ - (void)viewDidLoad { [super viewDidLoad]; - CGFloat wkWebViewWidth = self.acquireTokenView.frame.size.width*0.5; - CGFloat wkWebViewHeight = self.acquireTokenView.frame.size.height*0.75; - CGFloat wkWebViewOffsetX = 0; - CGFloat wkWebViewOffsetY = self.acquireTokenView.frame.size.height*0.15; WKWebViewConfiguration *defaultWKWebConfig = [MSALWebviewParameters defaultWKWebviewConfiguration]; - - self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(wkWebViewOffsetX,wkWebViewOffsetY,wkWebViewWidth,wkWebViewHeight) + self.webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:defaultWKWebConfig]; [self.webView setHidden:YES]; [self.acquireTokenView addSubview:self.webView]; + self.webView.translatesAutoresizingMaskIntoConstraints = NO; + [NSLayoutConstraint activateConstraints:@[ + [self.webView.leadingAnchor constraintEqualToAnchor:self.acquireTokenView.leadingAnchor constant:0], + [self.webView.trailingAnchor constraintEqualToAnchor:self.acquireTokenView.trailingAnchor constant:0], + [self.webView.topAnchor constraintEqualToAnchor:self.acquireTokenView.topAnchor constant:0], + [self.webView.bottomAnchor constraintEqualToAnchor:self.acquireTokenView.bottomAnchor constant:0], + ]]; + + self.settings = [MSALTestAppSettings settings]; [self populateProfiles]; [self populateUsers];