Unified · Split
| @@ -35,6 +35,18 @@ enum { · 34 unmodified lines | ||
| 35 | 35 | RENDER_TIMER_PRECISE, |
| 36 | 36 | }; |
| 37 | 37 | |
| 38 | +enum { | |
| 39 | + MAC_APPEAR_AUTO = 0, | |
| 40 | + MAC_APPEAR_AQUA, | |
| 41 | + MAC_APPEAR_DARK_AQUA, | |
| 42 | + MAC_APPEAR_VIBRANT_LIGHT, | |
| 43 | + MAC_APPEAR_VIBRANT_DARK, | |
| 44 | + MAC_APPEAR_AQUA_HC, | |
| 45 | + MAC_APPEAR_DARK_AQUA_HC, | |
| 46 | + MAC_APPEAR_VIBRANT_LIGHT_HC, | |
| 47 | + MAC_APPEAR_VIBRANT_DARK_HC, | |
| 48 | +}; | |
| 49 | + | |
| 38 | 50 | enum { |
| 39 | 51 | MAC_CSP_AUTO = -1, |
| 40 | 52 | MAC_CSP_DISPLAY_P3, |
| @@ -27,11 +27,15 @@ · 26 unmodified lines | ||
| 27 | 27 | const struct m_sub_options macos_conf = { |
| 28 | 28 | .opts = (const struct m_option[]) { |
| 29 | 29 | {"macos-title-bar-appearance", OPT_CHOICE(macos_title_bar_appearance, |
| 30 | − {"auto", 0}, {"aqua", 1}, {"darkAqua", 2}, | |
| 31 | − {"vibrantLight", 3}, {"vibrantDark", 4}, | |
| 32 | − {"aquaHighContrast", 5}, {"darkAquaHighContrast", 6}, | |
| 33 | − {"vibrantLightHighContrast", 7}, | |
| 34 | − {"vibrantDarkHighContrast", 8})}, | |
| 30 | + {"auto", MAC_APPEAR_AUTO}, | |
| 31 | + {"aqua", MAC_APPEAR_AQUA}, | |
| 32 | + {"darkAqua", MAC_APPEAR_DARK_AQUA}, | |
| 33 | + {"vibrantLight", MAC_APPEAR_VIBRANT_LIGHT}, | |
| 34 | + {"vibrantDark", MAC_APPEAR_VIBRANT_DARK}, | |
| 35 | + {"aquaHighContrast", MAC_APPEAR_AQUA_HC}, | |
| 36 | + {"darkAquaHighContrast", MAC_APPEAR_DARK_AQUA_HC}, | |
| 37 | + {"vibrantLightHighContrast", MAC_APPEAR_VIBRANT_LIGHT_HC}, | |
| 38 | + {"vibrantDarkHighContrast", MAC_APPEAR_VIBRANT_DARK_HC})}, | |
| 35 | 39 | {"macos-title-bar-material", OPT_CHOICE(macos_title_bar_material, |
| 36 | 40 | {"titlebar", 0}, {"selection", 1}, {"menu", 2}, |
| 37 | 41 | {"popover", 3}, {"sidebar", 4}, {"headerView", 5}, |
| @@ -92,16 +92,16 @@ class TitleBar: NSVisualEffectView { · 91 unmodified lines | ||
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | func set(appearance: Int32) { |
| 95 | − window?.appearance = { switch appearance { | |
| 96 | − case 1: return NSAppearance(named: .aqua) | |
| 97 | − case 2: return NSAppearance(named: .darkAqua) | |
| 98 | − case 3: return NSAppearance(named: .vibrantLight) | |
| 99 | − case 4: return NSAppearance(named: .vibrantDark) | |
| 100 | − case 5: return NSAppearance(named: .accessibilityHighContrastAqua) | |
| 101 | − case 6: return NSAppearance(named: .accessibilityHighContrastDarkAqua) | |
| 102 | − case 7: return NSAppearance(named: .accessibilityHighContrastVibrantLight) | |
| 103 | − case 8: return NSAppearance(named: .accessibilityHighContrastVibrantDark) | |
| 104 | − case 0: return nil | |
| 95 | + window?.appearance = { switch Int(appearance) { | |
| 96 | + case MAC_APPEAR_AQUA: return NSAppearance(named: .aqua) | |
| 97 | + case MAC_APPEAR_DARK_AQUA: return NSAppearance(named: .darkAqua) | |
| 98 | + case MAC_APPEAR_VIBRANT_LIGHT: return NSAppearance(named: .vibrantLight) | |
| 99 | + case MAC_APPEAR_VIBRANT_DARK: return NSAppearance(named: .vibrantDark) | |
| 100 | + case MAC_APPEAR_AQUA_HC: return NSAppearance(named: .accessibilityHighContrastAqua) | |
| 101 | + case MAC_APPEAR_DARK_AQUA_HC: return NSAppearance(named: .accessibilityHighContrastDarkAqua) | |
| 102 | + case MAC_APPEAR_VIBRANT_LIGHT_HC: return NSAppearance(named: .accessibilityHighContrastVibrantLight) | |
| 103 | + case MAC_APPEAR_VIBRANT_DARK_HC: return NSAppearance(named: .accessibilityHighContrastVibrantDark) | |
| 104 | + case MAC_APPEAR_AUTO: return nil | |
| 105 | 105 | default: return nil |
| 106 | 106 | } |
| 107 | 107 | }() |