From 204e3f0df63d9e9ad93d8ece0b6dcfa4c5246fa7 Mon Sep 17 00:00:00 2001
From: der richter <der.richter@gmx.de>
Date: Tue, 19 Mar 2024 23:15:42 +0100
Subject: mac/option: rename option structs to properly represent their content

also optimise option cache setup.
---
 video/out/mac/window.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'video/out/mac/window.swift')

diff --git a/video/out/mac/window.swift b/video/out/mac/window.swift
index 5949aa1337..719ae9fb05 100644
--- a/video/out/mac/window.swift
+++ b/video/out/mac/window.swift
@@ -92,7 +92,7 @@ class Window: NSWindow, NSWindowDelegate {
         title = com.title
         minSize = NSMakeSize(160, 90)
         collectionBehavior = .fullScreenPrimary
-        ignoresMouseEvents = option.opts.cursor_passthrough
+        ignoresMouseEvents = option.vo.cursor_passthrough
         delegate = self
 
         if let cView = contentView {
@@ -143,7 +143,7 @@ class Window: NSWindow, NSWindowDelegate {
             setFrame(frame, display: true)
         }
 
-        if Bool(option.opts.native_fs) {
+        if Bool(option.vo.native_fs) {
             super.toggleFullScreen(sender)
         } else {
             if !isInFullscreen {
@@ -283,7 +283,7 @@ class Window: NSWindow, NSWindowDelegate {
     }
 
     func getFsAnimationDuration(_ def: Double) -> Double {
-        let duration = option.macOpts.macos_fs_animation_duration
+        let duration = option.mac.macos_fs_animation_duration
         if duration < 0 {
             return def
         } else {
-- 
cgit v1.2.3