summaryrefslogtreecommitdiffstats
path: root/video/out/mac/title_bar.swift
diff options
context:
space:
mode:
Diffstat (limited to 'video/out/mac/title_bar.swift')
-rw-r--r--video/out/mac/title_bar.swift125
1 files changed, 44 insertions, 81 deletions
diff --git a/video/out/mac/title_bar.swift b/video/out/mac/title_bar.swift
index e49c2bb99c..98d94c14ce 100644
--- a/video/out/mac/title_bar.swift
+++ b/video/out/mac/title_bar.swift
@@ -19,16 +19,14 @@ import Cocoa
class TitleBar: NSVisualEffectView {
unowned var common: Common
- var mpv: MPVHelper? { get { return common.mpv } }
+ var option: OptionHelper { return common.option }
- var systemBar: NSView? {
- get { return common.window?.standardWindowButton(.closeButton)?.superview }
- }
+ var systemBar: NSView? { return common.window?.standardWindowButton(.closeButton)?.superview }
static var height: CGFloat {
- get { return NSWindow.frameRect(forContentRect: CGRect.zero, styleMask: .titled).size.height }
+ return NSWindow.frameRect(forContentRect: CGRect.zero, styleMask: .titled).size.height
}
var buttons: [NSButton] {
- get { return ([.closeButton, .miniaturizeButton, .zoomButton] as [NSWindow.ButtonType]).compactMap { common.window?.standardWindowButton($0) } }
+ return ([.closeButton, .miniaturizeButton, .zoomButton] as [NSWindow.ButtonType]).compactMap { common.window?.standardWindowButton($0) }
}
override var material: NSVisualEffectView.Material {
@@ -36,22 +34,16 @@ class TitleBar: NSVisualEffectView {
set {
super.material = newValue
// fix for broken deprecated materials
- if material == .light || material == .dark {
- state = .active
- } else if #available(macOS 10.11, *),
- material == .mediumLight || material == .ultraDark
- {
+ if material == .light || material == .dark || material == .mediumLight || material == .ultraDark {
state = .active
} else {
state = .followsWindowActiveState
}
-
}
}
init(frame: NSRect, window: NSWindow, common com: Common) {
- let f = NSMakeRect(0, frame.size.height - TitleBar.height,
- frame.size.width, TitleBar.height)
+ let f = NSRect(x: 0, y: frame.size.height - TitleBar.height, width: frame.size.width, height: TitleBar.height + 1)
common = com
super.init(frame: f)
buttons.forEach { $0.isHidden = true }
@@ -66,9 +58,9 @@ class TitleBar: NSVisualEffectView {
window.contentView?.addSubview(self, positioned: .above, relativeTo: nil)
window.titlebarAppearsTransparent = true
window.styleMask.insert(.fullSizeContentView)
- set(appearance: Int(mpv?.macOpts.macos_title_bar_appearance ?? 0))
- set(material: Int(mpv?.macOpts.macos_title_bar_material ?? 0))
- set(color: mpv?.macOpts.macos_title_bar_color ?? "#00000000")
+ set(appearance: Int(option.mac.macos_title_bar_appearance))
+ set(material: Int(option.mac.macos_title_bar_material))
+ set(color: option.mac.macos_title_bar_color)
}
required init?(coder: NSCoder) {
@@ -135,7 +127,7 @@ class TitleBar: NSVisualEffectView {
let loc = common.view?.convert(window.mouseLocationOutsideOfEventStream, from: nil)
buttons.forEach { $0.isHidden = false }
- NSAnimationContext.runAnimationGroup({ (context) -> Void in
+ NSAnimationContext.runAnimationGroup({ (context) in
context.duration = 0.20
systemBar?.animator().alphaValue = 1
if !window.isInFullscreen && !window.isAnimating {
@@ -158,7 +150,7 @@ class TitleBar: NSVisualEffectView {
isHidden = true
return
}
- NSAnimationContext.runAnimationGroup({ (context) -> Void in
+ NSAnimationContext.runAnimationGroup({ (context) in
context.duration = duration
systemBar?.animator().alphaValue = 0
animator().alphaValue = 0
@@ -179,77 +171,48 @@ class TitleBar: NSVisualEffectView {
switch string {
case "1", "aqua":
return NSAppearance(named: .aqua)
+ case "2", "darkAqua":
+ return NSAppearance(named: .darkAqua)
case "3", "vibrantLight":
return NSAppearance(named: .vibrantLight)
case "4", "vibrantDark":
return NSAppearance(named: .vibrantDark)
- default: break
+ case "5", "aquaHighContrast":
+ return NSAppearance(named: .accessibilityHighContrastAqua)
+ case "6", "darkAquaHighContrast":
+ return NSAppearance(named: .accessibilityHighContrastDarkAqua)
+ case "7", "vibrantLightHighContrast":
+ return NSAppearance(named: .accessibilityHighContrastVibrantLight)
+ case "8", "vibrantDarkHighContrast":
+ return NSAppearance(named: .accessibilityHighContrastVibrantDark)
+ case "0", "auto":
+ return nil
+ default:
+ return nil
}
-
- if #available(macOS 10.14, *) {
- switch string {
- case "2", "darkAqua":
- return NSAppearance(named: .darkAqua)
- case "5", "aquaHighContrast":
- return NSAppearance(named: .accessibilityHighContrastAqua)
- case "6", "darkAquaHighContrast":
- return NSAppearance(named: .accessibilityHighContrastDarkAqua)
- case "7", "vibrantLightHighContrast":
- return NSAppearance(named: .accessibilityHighContrastVibrantLight)
- case "8", "vibrantDarkHighContrast":
- return NSAppearance(named: .accessibilityHighContrastVibrantDark)
- case "0", "auto": fallthrough
- default:
-#if HAVE_MACOS_10_14_FEATURES
- return nil
-#else
- break
-#endif
- }
- }
-
- let style = UserDefaults.standard.string(forKey: "AppleInterfaceStyle")
- return appearanceFrom(string: style == nil ? "aqua" : "vibrantDark")
}
func materialFrom(string: String) -> NSVisualEffectView.Material {
switch string {
- case "1", "selection": return .selection
- case "0", "titlebar": return .titlebar
- case "14", "dark": return .dark
- case "15", "light": return .light
- default: break
+ case "0", "titlebar": return .titlebar
+ case "1", "selection": return .selection
+ case "2", "menu": return .menu
+ case "3", "popover": return .popover
+ case "4", "sidebar": return .sidebar
+ case "5", "headerView": return .headerView
+ case "6", "sheet": return .sheet
+ case "7", "windowBackground": return .windowBackground
+ case "8", "hudWindow": return .hudWindow
+ case "9", "fullScreen": return .fullScreenUI
+ case "10", "toolTip": return .toolTip
+ case "11", "contentBackground": return .contentBackground
+ case "12", "underWindowBackground": return .underWindowBackground
+ case "13", "underPageBackground": return .underPageBackground
+ case "14", "dark": return .dark
+ case "15", "light": return .light
+ case "16", "mediumLight": return .mediumLight
+ case "17", "ultraDark": return .ultraDark
+ default: return .titlebar
}
-
-#if HAVE_MACOS_10_11_FEATURES
- if #available(macOS 10.11, *) {
- switch string {
- case "2,", "menu": return .menu
- case "3", "popover": return .popover
- case "4", "sidebar": return .sidebar
- case "16", "mediumLight": return .mediumLight
- case "17", "ultraDark": return .ultraDark
- default: break
- }
- }
-#endif
-#if HAVE_MACOS_10_14_FEATURES
- if #available(macOS 10.14, *) {
- switch string {
- case "5,", "headerView": return .headerView
- case "6", "sheet": return .sheet
- case "7", "windowBackground": return .windowBackground
- case "8", "hudWindow": return .hudWindow
- case "9", "fullScreen": return .fullScreenUI
- case "10", "toolTip": return .toolTip
- case "11", "contentBackground": return .contentBackground
- case "12", "underWindowBackground": return .underWindowBackground
- case "13", "underPageBackground": return .underPageBackground
- default: break
- }
- }
-#endif
-
- return .titlebar
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 19:55:54 +0000