From 37769da70fada744dcc8f56f867dec6b4335d6bf Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 31 Mar 2016 15:42:31 +0100 Subject: [PATCH] mac ui: Update to San Francisco font --- .../Mac/UserInterface/UserInterface.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SparkleShare/Mac/UserInterface/UserInterface.cs b/SparkleShare/Mac/UserInterface/UserInterface.cs index 241d9b85..e53e472b 100755 --- a/SparkleShare/Mac/UserInterface/UserInterface.cs +++ b/SparkleShare/Mac/UserInterface/UserInterface.cs @@ -30,18 +30,12 @@ namespace SparkleShare { public Bubbles Bubbles; public About About; public Note Note; - - public static string FontName = "Helvetica Neue"; public UserInterface () { - // TODO: SF Font - if (Environment.OSVersion.Version.Major < 14) - FontName = "Lucida Grande"; - SparkleShare.Controller.Invoke (() => { - // NSApplication.SharedApplication.ApplicationIconImage = NSImage.ImageNamed ("Resources/sparkleshare-app.icns"); + NSApplication.SharedApplication.ApplicationIconImage = NSImage.ImageNamed ("sparkleshare-app.icns"); Setup = new Setup (); EventLog = new EventLog (); @@ -61,10 +55,16 @@ namespace SparkleShare { } - public void UpdateDockIconVisibility () - { - // if (Setup.IsVisible || EventLog.IsVisible || About.IsVisible) - // NSApplication.SharedApplication.ActivationPolicy = NSApplicationActivationPolicy.Regular; + public static string FontName { + get { + if (Environment.OSVersion.Version.Major < 14) + return "Lucida Grande"; + + if (Environment.OSVersion.Version.Major < 15) + return "Helvetica Neue"; + + return "SF UI Text"; + } } }