Visual tweaks

SBrowser/Browser View/ToolbarViewController.swift

@@ -18,6 +18,12 @@ class ToolbarButtonView: UIView
         setNeedsLayout()
     }
     
+    func removeAllButtonViews() {
+        buttonViews.forEach { $0.removeFromSuperview() }
+        buttonViews.removeAll()
+        setNeedsLayout()
+    }
+    
     override func sizeThatFits(_ size: CGSize) -> CGSize {
         let width: CGFloat = buttonViews.reduce(0.0) { (result, button) -> CGFloat in
             return result + button.sizeThatFits(size).width + buttonPadding
@@ -61,6 +67,12 @@ class ToolbarView: UIView
         
         cancelButton.setTitle("Cancel", for: .normal)
         containerView.addSubview(cancelButton)
+        
+        layer.masksToBounds = false
+        layer.shadowColor = UIColor.black.cgColor
+        layer.shadowOpacity = 0.2
+        layer.shadowOffset = CGSize(width: 0.0, height: 1.0)
+        layer.shadowRadius = 1.5
     }
     
     override func sizeThatFits(_ size: CGSize) -> CGSize
@@ -115,6 +127,7 @@ class ToolbarViewController: UIViewController
     let scriptControllerIconView = ScriptControllerIconView()
     let shareButton = UIButton(frame: .zero)
     let darkModeButton = UIButton(frame: .zero)
+    let windowButton = UIButton(frame: .zero)
     
     var darkModeEnabled: Bool = false {
         didSet {
@@ -134,12 +147,14 @@ class ToolbarViewController: UIViewController
         
         toolbarView.urlBar = urlBar
         
+        // Dark mode button
         darkModeButton.setImage(darkModeDisabledImage, for: .normal)
-        toolbarView.buttonsView.addButtonView(darkModeButton)
         
+        // Share button
         shareButton.setImage(UIImage(systemName: "square.and.arrow.up"), for: .normal)
-        toolbarView.buttonsView.addButtonView(shareButton)
-        toolbarView.buttonsView.addButtonView(scriptControllerIconView)
+        
+        // Window button
+        windowButton.setImage(UIImage(systemName: "rectangle.on.rectangle"), for: .normal)
         
         let toolbarAnimationDuration: TimeInterval = 0.3
         urlBar.textField.addAction(.init(handler: { _ in
@@ -151,6 +166,26 @@ class ToolbarViewController: UIViewController
         toolbarView.cancelButton.addAction(.init(handler: { action in
             self.urlBar.textField.resignFirstResponder()
         }), for: .touchUpInside)
+        
+        traitCollectionDidChange(nil)
+    }
+    
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        
+        toolbarView.buttonsView.removeAllButtonViews()
+        
+        // Setup toolbar based on trait collection
+        if traitCollection.horizontalSizeClass == .compact {
+            toolbarView.buttonsView.addButtonView(darkModeButton)
+            toolbarView.buttonsView.addButtonView(scriptControllerIconView)
+            toolbarView.buttonsView.addButtonView(windowButton)
+        } else {
+            toolbarView.buttonsView.addButtonView(darkModeButton)
+            toolbarView.buttonsView.addButtonView(shareButton)
+            toolbarView.buttonsView.addButtonView(scriptControllerIconView)
+            toolbarView.buttonsView.addButtonView(windowButton)
+        }
     }
     
     override func loadView() {