From bdcd4f3466006bef90f49697ecebe66257d0a6b8 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 13 Nov 2023 18:59:15 +0100 Subject: [PATCH] Remove some warnings --- VimR/VimR/AdvencedPref.swift | 2 +- VimR/VimR/MainWindow+Delegates.swift | 2 +- VimR/VimR/Theme.swift | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VimR/VimR/AdvencedPref.swift b/VimR/VimR/AdvencedPref.swift index 6d15e7ba..239d7003 100644 --- a/VimR/VimR/AdvencedPref.swift +++ b/VimR/VimR/AdvencedPref.swift @@ -90,7 +90,7 @@ final class AdvancedPref: PrefPane, UiComponent, NSTextFieldDelegate { self.useInteractiveZshCheckbox.boolState = self.useInteractiveZsh self.useLiveResizeCheckbox.boolState = self.useLiveResize self.drawsParallelCheckbox.boolState = self.drawsParallel - self.nvimBinaryField.string = self.nvimBinary ?? "" + self.nvimBinaryField.string = self.nvimBinary } private func addViews() { diff --git a/VimR/VimR/MainWindow+Delegates.swift b/VimR/VimR/MainWindow+Delegates.swift index 14e6cff4..2571bfa2 100644 --- a/VimR/VimR/MainWindow+Delegates.swift +++ b/VimR/VimR/MainWindow+Delegates.swift @@ -102,7 +102,7 @@ extension MainWindow { for: .setTheme(Theme(from: nvimTheme, additionalColorDict: colors)) ) ) - }, onError: { + }, onFailure: { _ in self.log.trace("oops couldn't set theme") }) .disposed(by: self.disposeBag) diff --git a/VimR/VimR/Theme.swift b/VimR/VimR/Theme.swift index aee89e5e..89e769fe 100644 --- a/VimR/VimR/Theme.swift +++ b/VimR/VimR/Theme.swift @@ -39,7 +39,10 @@ struct Theme: CustomStringConvertible { var background = NSColor.textBackgroundColor var highlightForeground = NSColor.selectedMenuItemTextColor - var highlightBackground = NSColor.selectedMenuItemColor + // NSColor.selectedMenuItemColor is deprecated. The doc says that + // NSVisualEffectView.Material.selection should be used instead, but I don't know how to get + // an NSColor from it. + var highlightBackground = NSColor.selectedContentBackgroundColor var directoryForeground = NSColor.textColor