|
|
@@ -155,9 +155,9 @@ private extension ViewController {
|
|
155
|
155
|
stack.spacing = 4
|
|
156
|
156
|
|
|
157
|
157
|
stack.addArrangedSubview(topTab("Meet", icon: "", selected: true, logoImageName: "MeetLogo"))
|
|
158
|
|
- stack.addArrangedSubview(topTab("Zoom", icon: "", selected: false, logoImageName: "ZoomLogo", logoPointSize: 30))
|
|
159
|
|
- stack.addArrangedSubview(topTab("Teams", icon: "", selected: false))
|
|
160
|
|
- stack.addArrangedSubview(topTab("Zoho", icon: "", selected: false))
|
|
|
158
|
+ stack.addArrangedSubview(topTab("Zoom", icon: "", selected: false, logoImageName: "ZoomLogo", logoPointSize: 34))
|
|
|
159
|
+ stack.addArrangedSubview(topTab("Teams", icon: "", selected: false, logoImageName: "TeamsLogo", logoPointSize: 26, logoHeightMultiplier: 62.0 / 50.0, logoTemplate: false))
|
|
|
160
|
+ stack.addArrangedSubview(topTab("Zoho", icon: "", selected: false, logoImageName: "ZohoLogo", logoPointSize: 28))
|
|
161
|
161
|
|
|
162
|
162
|
shell.addSubview(stack)
|
|
163
|
163
|
wrapper.addSubview(shell)
|
|
|
@@ -389,7 +389,7 @@ private extension ViewController {
|
|
389
|
389
|
return item
|
|
390
|
390
|
}
|
|
391
|
391
|
|
|
392
|
|
- func topTab(_ title: String, icon: String, selected: Bool, logoImageName: String? = nil, logoPointSize: CGFloat = 26) -> NSView {
|
|
|
392
|
+ func topTab(_ title: String, icon: String, selected: Bool, logoImageName: String? = nil, logoPointSize: CGFloat = 26, logoHeightMultiplier: CGFloat = 1, logoTemplate: Bool = true) -> NSView {
|
|
393
|
393
|
let tab = roundedContainer(cornerRadius: 19, color: selected ? palette.primaryBlue : .clear)
|
|
394
|
394
|
tab.translatesAutoresizingMaskIntoConstraints = false
|
|
395
|
395
|
|
|
|
@@ -400,7 +400,9 @@ private extension ViewController {
|
|
400
|
400
|
imageView.imageScaling = .scaleProportionallyDown
|
|
401
|
401
|
imageView.imageAlignment = .alignCenter
|
|
402
|
402
|
imageView.isEditable = false
|
|
403
|
|
- imageView.contentTintColor = palette.textPrimary
|
|
|
403
|
+ if logoTemplate {
|
|
|
404
|
+ imageView.contentTintColor = palette.textPrimary
|
|
|
405
|
+ }
|
|
404
|
406
|
leadingView = imageView
|
|
405
|
407
|
} else {
|
|
406
|
408
|
leadingView = textLabel(icon, font: typography.tabIcon, color: palette.textPrimary)
|
|
|
@@ -420,7 +422,7 @@ private extension ViewController {
|
|
420
|
422
|
if logoImageName != nil {
|
|
421
|
423
|
constraints.append(contentsOf: [
|
|
422
|
424
|
leadingView.widthAnchor.constraint(equalToConstant: logoPointSize),
|
|
423
|
|
- leadingView.heightAnchor.constraint(equalToConstant: logoPointSize)
|
|
|
425
|
+ leadingView.heightAnchor.constraint(equalToConstant: logoPointSize * logoHeightMultiplier)
|
|
424
|
426
|
])
|
|
425
|
427
|
}
|
|
426
|
428
|
NSLayoutConstraint.activate(constraints)
|