From 19eba3efa4dc39ff8a11bb967a4302fe69e975ae Mon Sep 17 00:00:00 2001 From: Vaclav Vancura Date: Tue, 15 Sep 2015 21:07:06 +0200 Subject: [Mac] Toolbar: status are alignment fixes for El Capitan --- main/src/addins/MacPlatform/MainToolbar/StatusBar.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main') diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index f2e5d046f1..b51e837d96 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -154,7 +154,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar BezelStyle = NSTextFieldBezelStyle.Rounded; WantsLayer = true; - Layer.CornerRadius = 4; + Layer.CornerRadius = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 8 : 4; ctxHandler = new StatusBarContextHandler (this); updateHandler = delegate { @@ -298,12 +298,12 @@ namespace MonoDevelop.MacIntegration.MainToolbar right -= 9; if (layer != null) { - layer.Frame = new CGRect (right, 3, 1, 16); + layer.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, 1, 16); layer.SetNeedsDisplay (); } else { layer = CALayer.Create (); layer.Name = SeparatorLayerId; - layer.Frame = new CGRect (right, 3, 1, 16); + layer.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, 1, 16); layer.BackgroundColor = NSColor.LightGray.CGColor; Layer.AddSublayer (layer); } @@ -341,12 +341,12 @@ namespace MonoDevelop.MacIntegration.MainToolbar nfloat right = DrawSeparatorIfNeeded (LeftMostStatusItemX ()); CGSize size = buildResultText.AttributedString.Size; right = right - 6 - size.Width; - buildResultText.Frame = new CGRect (right, 5f, size.Width, size.Height); + buildResultText.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 6 : 5, size.Width, size.Height); if (buildResultText.SuperLayer == null) Layer.AddSublayer (buildResultText); buildResultText.SetNeedsDisplay (); right -= buildResultIcon.Bounds.Width; - buildResultIcon.Frame = new CGRect (right, 3, buildResultIcon.Bounds.Width, buildResultIcon.Bounds.Height); + buildResultIcon.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, buildResultIcon.Bounds.Width, buildResultIcon.Bounds.Height); if (buildResultIcon.SuperLayer == null) Layer.AddSublayer (buildResultIcon); @@ -364,7 +364,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar RemoveTrackingArea (icon.TrackingArea); right -= item.Bounds.Width + 6; - item.Frame = new CGRect (right, 3, item.Bounds.Width, item.Bounds.Height); + item.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, item.Bounds.Width, item.Bounds.Height); var area = new NSTrackingArea (item.Frame, NSTrackingAreaOptions.MouseEnteredAndExited | NSTrackingAreaOptions.ActiveInKeyWindow, this, null); AddTrackingArea (area); -- cgit v1.2.3