From cb9d2b62ad2070bde4312ddd3f4f376adec0025c Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Sun, 2 Oct 2016 01:39:21 +0800 Subject: [PATCH] Convert to swift 3 syntax. --- ShadowsocksX-NG/AppDelegate.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 3ba2832..a0fae32 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -376,8 +376,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele } func updateStatusItemUI() { - let defaults = NSUserDefaults.standardUserDefaults() - let mode = defaults.stringForKey("ShadowsocksRunningMode") + let defaults = UserDefaults.standard + let mode = defaults.string(forKey: "ShadowsocksRunningMode") if mode == "auto" { statusItem.title = "Auto".localized } else if mode == "global" { @@ -385,7 +385,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele } else if mode == "manual" { statusItem.title = "Manual".localized } - let titleWidth = statusItem.title!.sizeWithAttributes([NSFontAttributeName: statusItem.button!.font!]).width + let titleWidth = statusItem.title!.size(withAttributes: [NSFontAttributeName: statusItem.button!.font!]).width let imageWidth:CGFloat = 22 statusItem.length = titleWidth + imageWidth }