iPad support

This commit is contained in:
James Magahern
2020-07-29 18:34:46 -07:00
parent 220fc6f070
commit 663dfcd2bb
3 changed files with 32 additions and 21 deletions

View File

@@ -82,12 +82,12 @@ class ToolbarView: UIView
// Cancel button
let urlBarPadding: CGFloat = 8.0
let cancelButtonSize = cancelButton.sizeThatFits(containerView.bounds.size)
cancelButton.frame = CGRect(origin: CGPoint(x: (urlBar?.frame.maxX ?? 0) + urlBarPadding, y: 0),
cancelButton.frame = CGRect(origin: CGPoint(x: (containerView.bounds.maxX - cancelButtonSize.width), y: 0),
size: CGSize(width: cancelButtonSize.width, height: containerView.bounds.height))
// Toolbar buttons
let toolbarSize = buttonsView.sizeThatFits(containerView.bounds.size)
buttonsView.frame = CGRect(origin: CGPoint(x: (urlBar?.frame.maxX ?? 0) + urlBarPadding, y: 0), size: toolbarSize)
let buttonContainerSize = buttonsView.sizeThatFits(containerView.bounds.size)
buttonsView.frame = CGRect(origin: CGPoint(x: (containerView.bounds.maxX - buttonContainerSize.width) + urlBarPadding, y: 0), size: buttonContainerSize)
var avoidingSize: CGSize = .zero
if cancelButtonVisible {
@@ -99,7 +99,7 @@ class ToolbarView: UIView
cancelButton.alpha = 0.0
buttonsView.alpha = 1.0
avoidingSize = toolbarSize
avoidingSize = buttonContainerSize
}
if let urlBar = urlBar {