mac/title: use enum for appearance values instead of generic integers

der richter committed 1 year ago

Commit 4063cdf1 parent e696b753 files · +31 −15Browse files

Unified · Split

3 files

osdep/mac/app_bridge.h +12 −0
osdep/mac/app_bridge.m +9 −5
video/out/mac/title_bar.swift +10 −10

@@ -35,6 +35,18 @@ enum { · 34 unmodified lines
35	RENDER_TIMER_PRECISE,	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	enum {	50	enum {
39	MAC_CSP_AUTO = -1,	51	MAC_CSP_AUTO = -1,
40	MAC_CSP_DISPLAY_P3,	52	MAC_CSP_DISPLAY_P3,

osdep/mac/app_bridge.m+9−5

 const struct m_sub_options macos_conf = {
     .opts = (const struct m_option[]) {
         {"macos-title-bar-appearance", OPT_CHOICE(macos_title_bar_appearance,
-            {"auto", 0}, {"aqua", 1}, {"darkAqua", 2},
+            {"auto", MAC_APPEAR_AUTO},
-            {"vibrantLight", 3}, {"vibrantDark", 4},
+            {"aqua", MAC_APPEAR_AQUA},
-            {"aquaHighContrast", 5}, {"darkAquaHighContrast", 6},
+            {"darkAqua", MAC_APPEAR_DARK_AQUA},
-            {"vibrantLightHighContrast", 7},
+            {"vibrantLight", MAC_APPEAR_VIBRANT_LIGHT},
-            {"vibrantDarkHighContrast", 8})},
+            {"vibrantDark", MAC_APPEAR_VIBRANT_DARK},
+            {"aquaHighContrast", MAC_APPEAR_AQUA_HC},
+            {"darkAquaHighContrast", MAC_APPEAR_DARK_AQUA_HC},
+            {"vibrantLightHighContrast", MAC_APPEAR_VIBRANT_LIGHT_HC},
+            {"vibrantDarkHighContrast", MAC_APPEAR_VIBRANT_DARK_HC})},
         {"macos-title-bar-material", OPT_CHOICE(macos_title_bar_material,
             {"titlebar", 0}, {"selection", 1}, {"menu", 2},
             {"popover", 3}, {"sidebar", 4}, {"headerView", 5},

video/out/mac/title_bar.swift+10−10

@@ -92,16 +92,16 @@ class TitleBar: NSVisualEffectView { · 91 unmodified lines
92	}	92	}
93		93
94	func set(appearance: Int32) {	94	func set(appearance: Int32) {
95	window?.appearance = { switch appearance {	95	window?.appearance = { switch Int(appearance) {
96	case 1: return NSAppearance(named: .aqua)	96	case MAC_APPEAR_AQUA: return NSAppearance(named: .aqua)
97	case 2: return NSAppearance(named: .darkAqua)	97	case MAC_APPEAR_DARK_AQUA: return NSAppearance(named: .darkAqua)
98	case 3: return NSAppearance(named: .vibrantLight)	98	case MAC_APPEAR_VIBRANT_LIGHT: return NSAppearance(named: .vibrantLight)
99	case 4: return NSAppearance(named: .vibrantDark)	99	case MAC_APPEAR_VIBRANT_DARK: return NSAppearance(named: .vibrantDark)
100	case 5: return NSAppearance(named: .accessibilityHighContrastAqua)	100	case MAC_APPEAR_AQUA_HC: return NSAppearance(named: .accessibilityHighContrastAqua)
101	case 6: return NSAppearance(named: .accessibilityHighContrastDarkAqua)	101	case MAC_APPEAR_DARK_AQUA_HC: return NSAppearance(named: .accessibilityHighContrastDarkAqua)
102	case 7: return NSAppearance(named: .accessibilityHighContrastVibrantLight)	102	case MAC_APPEAR_VIBRANT_LIGHT_HC: return NSAppearance(named: .accessibilityHighContrastVibrantLight)
103	case 8: return NSAppearance(named: .accessibilityHighContrastVibrantDark)	103	case MAC_APPEAR_VIBRANT_DARK_HC: return NSAppearance(named: .accessibilityHighContrastVibrantDark)
104	case 0: return nil	104	case MAC_APPEAR_AUTO: return nil
105	default: return nil	105	default: return nil
106	}	106	}
107	}()	107	}()

mac/title: use enum for appearance values instead of generic integers

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code