Commit e2e107ca authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

[iOS] Fix toolbar issues with Dynamic Type

This CL fixes few issues with Dynamic Type in the toolbar:
- The steady view label is cut and wrongly positionned in fullscreen.
- The location bar isn't pill shaped.
- The incognito ntp's top icon can be cut out by the toolbar.

Bug: 892145
Change-Id: Ic9c35f593bf776cc506661da35a786ed584ae6fb
Reviewed-on: https://chromium-review.googlesource.com/c/1333392
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarStepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607967}
parent b03731cd
......@@ -314,7 +314,6 @@ CGFloat ToolbarHeight() {
_fakeLocationBar.userInteractionEnabled = NO;
_fakeLocationBar.backgroundColor =
[UIColor colorWithWhite:0 alpha:kAdaptiveLocationBarBackgroundAlpha];
_fakeLocationBar.layer.cornerRadius = kAdaptiveLocationBarCornerRadius;
_fakeLocationBar.translatesAutoresizingMaskIntoConstraints = NO;
}
return _fakeLocationBar;
......
......@@ -192,7 +192,6 @@ const CGFloat kButtonTrailingSpacing = 10;
_locationButton = [[LocationBarSteadyButton alloc] init];
_locationButton.translatesAutoresizingMaskIntoConstraints = NO;
_locationButton.layer.cornerRadius = kAdaptiveLocationBarCornerRadius;
[_locationButton addSubview:_trailingButton];
[_locationButton addSubview:_locationContainerView];
......
......@@ -139,6 +139,7 @@ source_set("ntp_internal") {
"//ios/chrome/browser/ui/context_menu",
"//ios/chrome/browser/ui/favicon",
"//ios/chrome/browser/ui/overscroll_actions",
"//ios/chrome/browser/ui/toolbar:toolbar_ui",
"//ios/chrome/browser/ui/toolbar/buttons",
"//ios/chrome/browser/web_state_list",
"//ios/chrome/common",
......
......@@ -8,6 +8,7 @@
#include "components/strings/grit/components_strings.h"
#include "ios/chrome/browser/application_context.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_utils.h"
#import "ios/chrome/browser/ui/url_loader.h"
#include "ios/chrome/browser/ui/util/rtl_geometry.h"
#include "ios/chrome/browser/ui/util/ui_util.h"
......@@ -350,7 +351,9 @@ NSAttributedString* FormatHTMLListForUILabel(NSString* listString) {
} else {
topInset = StatusBarHeight();
}
_topToolbarMarginHeight.constant = topInset + kAdaptiveToolbarHeight;
_topToolbarMarginHeight.constant =
topInset + ToolbarExpandedHeight(
self.traitCollection.preferredContentSizeCategory);
}
if (IsSplitToolbarMode(self)) {
......
......@@ -55,7 +55,6 @@ extern const CGFloat kExpandedLocationBarHorizontalMargin;
extern const CGFloat kContractedLocationBarHorizontalMargin;
// Adaptive Location bar constants.
extern const CGFloat kAdaptiveLocationBarCornerRadius;
extern const CGFloat kAdaptiveLocationBarBackgroundAlpha;
extern const CGFloat kAdaptiveLocationBarBackgroundAlphaIncognito;
extern const CGFloat kAdaptiveLocationBarVerticalMargin;
......
......@@ -37,19 +37,18 @@ const CGFloat kDimmedToolbarSpotlightAlpha = 0.14;
const CGFloat kExpandedLocationBarHorizontalMargin = 8;
const CGFloat kContractedLocationBarHorizontalMargin = 19;
const CGFloat kAdaptiveLocationBarCornerRadius = 18;
const CGFloat kAdaptiveLocationBarBackgroundAlpha = 0.09;
const CGFloat kAdaptiveLocationBarBackgroundAlphaIncognito = 0.12;
const CGFloat kAdaptiveLocationBarVerticalMargin = 6.0f;
const CGFloat kAdaptiveLocationBarVerticalMarginFullscreen = 3.0f;
const CGFloat kLocationBarVerticalMarginDynamicType = 2.0f;
const CGFloat kLocationBarVerticalMarginDynamicType = -1.0f;
const CGFloat kAdaptiveLocationBarExtraVerticalMargin = 1.0f;
const CGFloat kTopToolbarUnsplitMargin = 2;
const CGFloat kAdaptiveToolbarHeight = 48;
const CGFloat kNonDynamicToolbarHeight = 14;
const CGFloat kToolbarHeightFullscreen = 20;
const CGFloat kNonDynamicToolbarHeightFullscreen = 7;
const CGFloat kNonDynamicToolbarHeightFullscreen = 3;
NSString* const kToolbarToolsMenuButtonIdentifier =
@"kToolbarToolsMenuButtonIdentifier";
......
......@@ -229,8 +229,6 @@
self.locationBarContainer.backgroundColor =
[self.buttonFactory.toolbarConfiguration
locationBarBackgroundColorWithVisibility:1];
self.locationBarContainer.layer.cornerRadius =
kAdaptiveLocationBarCornerRadius;
[self.locationBarContainer
setContentHuggingPriority:UILayoutPriorityDefaultLow
forAxis:UILayoutConstraintAxisHorizontal];
......
......@@ -110,6 +110,8 @@
self.view.locationBarHeight.constant =
[self locationBarHeightForFullscreenProgress:1];
self.view.locationBarContainer.layer.cornerRadius =
self.view.locationBarHeight.constant / 2;
self.view.locationBarBottomConstraint.constant =
[self verticalMarginForLocationBarForFullscreenProgress:1];
......@@ -149,6 +151,8 @@
self.traitCollection.preferredContentSizeCategory) {
self.view.locationBarHeight.constant = [self
locationBarHeightForFullscreenProgress:self.previousFullscreenProgress];
self.view.locationBarContainer.layer.cornerRadius =
self.view.locationBarHeight.constant / 2;
}
}
......@@ -183,6 +187,8 @@
self.view.trailingStackView.alpha = alphaValue;
self.view.locationBarHeight.constant =
[self locationBarHeightForFullscreenProgress:progress];
self.view.locationBarContainer.layer.cornerRadius =
self.view.locationBarHeight.constant / 2;
self.view.locationBarBottomConstraint.constant =
[self verticalMarginForLocationBarForFullscreenProgress:progress];
self.view.locationBarContainer.backgroundColor =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment