Commit d6a18004 authored by Kurt Horimoto's avatar Kurt Horimoto Committed by Commit Bot

[iOS] Fix |-expandedTopToolbarHeight|.

CGRectGetMaxY() changes as the toolbars are translated, causing issues
when it is called from |-updateForFullscreenProgress:|.  This CL updates
the implementation to be based on the heights, rather than the frames.

Bug: 903229
Change-Id: Ice018324f426104467f80c21544435c612b3455f
Reviewed-on: https://chromium-review.googlesource.com/c/1328143Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607681}
parent 317fdb14
...@@ -3961,7 +3961,8 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint { ...@@ -3961,7 +3961,8 @@ applicationCommandEndpoint:(id<ApplicationCommands>)applicationCommandEndpoint {
return 0; return 0;
} }
return [self primaryToolbarHeightWithInset] + return [self primaryToolbarHeightWithInset] +
CGRectGetMaxY(self.tabStripView.frame); ([self canShowTabStrip] ? self.tabStripView.frame.size.height : 0.0) +
(self.usesFullscreenContainer ? self.headerOffset : 0.0);
} }
- (CGFloat)bottomToolbarHeight { - (CGFloat)bottomToolbarHeight {
......
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