10.14 compatibility: UI changes
- update select account UI
- fix ring about view overlapping
- fix size of titlebar items
Change-Id: Iab92e602693b5d2fcfca719bdb6883676c1f4ca1
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 72b5022..248a1f4 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -462,10 +462,14 @@
{
if(itemIdentifier == kChangeAccountToolBarItemIdentifier) {
NSToolbarItem *toolbarItem = [[NSToolbarItem alloc] initWithItemIdentifier:kChangeAccountToolBarItemIdentifier];
+ toolbarItem.maxSize = NSMakeSize(187, 30);
+ toolbarItem.minSize = NSMakeSize(187, 30);
toolbarItem.view = chooseAccountVC.view;
return toolbarItem;
} else if(itemIdentifier == kOpenAccountToolBarItemIdentifier) {
NSToolbarItem *toolbarItem = [[NSToolbarItem alloc] initWithItemIdentifier:kOpenAccountToolBarItemIdentifier];
+ toolbarItem.maxSize = NSMakeSize(30, 30);
+ toolbarItem.minSize = NSMakeSize(30, 30);
HoverButton *openSettingsButton = [[HoverButton alloc] initWithFrame:CGRectMake(0, 0, 28, 28)];
openSettingsButton.bgColor = [NSColor clearColor];
openSettingsButton.imageColor = [NSColor darkGrayColor];
diff --git a/src/views/AccountMenuItemView.mm b/src/views/AccountMenuItemView.mm
index c126a2d..d188b86 100644
--- a/src/views/AccountMenuItemView.mm
+++ b/src/views/AccountMenuItemView.mm
@@ -69,11 +69,11 @@
NSMenuItem *menuItem = ([self enclosingMenuItem]);
BOOL isHighlighted = [menuItem isHighlighted];
if (isHighlighted) {
- [self.backgroundView setFillColor:[NSColor controlLightHighlightColor]];
+ [self.backgroundView setFillColor:[NSColor whiteColor]];
} else {
- [self.backgroundView setFillColor:[NSColor controlColor]];
+ [self.backgroundView setFillColor:[NSColor ringGreyHighlight]];
}
- [super drawRect: rect];
+ [super drawRect: rect];
}
@end
diff --git a/ui/Base.lproj/AccountMenuItemView.xib b/ui/Base.lproj/AccountMenuItemView.xib
index 1dfcfd5..4b9532b 100644
--- a/ui/Base.lproj/AccountMenuItemView.xib
+++ b/ui/Base.lproj/AccountMenuItemView.xib
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
- <capability name="box content view" minToolsVersion="7.0"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -37,36 +36,22 @@
</constraints>
<color key="fillColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</box>
- <button toolTip="Create New Account" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BkF-b3-tzE" customClass="HoverButton">
+ <button toolTip="Create New Account" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BkF-b3-tzE">
<rect key="frame" x="0.0" y="0.0" width="230" height="60"/>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="lfv-A5-Wu4">
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="lfv-A5-Wu4">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="1" green="1" blue="1" alpha="0.83999999999999997" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="0"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
- <integer key="value" value="0"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V91-eS-dUh">
- <rect key="frame" x="48" y="30" width="44" height="20"/>
+ <rect key="frame" x="50" y="30" width="44" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="VWk-wM-WSB"/>
</constraints>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Label" id="7sc-IE-yuO">
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Label" drawsBackground="YES" id="7sc-IE-yuO">
<font key="font" metaFont="system" size="16"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="XKc-lc-K67">
@@ -78,7 +63,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="right" imageScaling="proportionallyDown" id="B0y-e0-cVi"/>
</imageView>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="TdK-5g-ddU" userLabel="AccountState" customClass="RoundedTextField">
- <rect key="frame" x="33" y="10" width="14" height="14"/>
+ <rect key="frame" x="34" y="10" width="13" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="13.5" id="Mj5-H6-ylc"/>
<constraint firstAttribute="width" constant="9.5" id="aYl-Xd-vky"/>
@@ -101,11 +86,11 @@
</userDefinedRuntimeAttributes>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tLn-uH-gZ6">
- <rect key="frame" x="48" y="10" width="35" height="16"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Label" id="uPR-fc-nOP">
+ <rect key="frame" x="50" y="10" width="35" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Label" drawsBackground="YES" id="uPR-fc-nOP">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IyH-ia-I3z">
@@ -115,16 +100,17 @@
<constraint firstAttribute="width" constant="20" id="QGs-sS-H6l"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="NSAddTemplate" id="9b9-Jo-NAF"/>
+ <color key="contentTintColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="calibratedRGB"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0PP-Di-b7L">
- <rect key="frame" x="192" y="30" width="35" height="20"/>
+ <rect key="frame" x="190" y="30" width="35" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="8mL-jo-3Kb"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Label" id="gOS-aC-TGo">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Label" drawsBackground="YES" id="gOS-aC-TGo">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
</textField>
</subviews>
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index a62477e..3325e8a 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -22,7 +22,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="Ring" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="RingMainWindow">
+ <window title="Ring" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="RingMainWindow">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
@@ -30,7 +30,7 @@
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<view key="contentView" autoresizesSubviews="NO" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="1053" height="658"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Pav-Bw-GgK">
<rect key="frame" x="322" y="0.0" width="5" height="658"/>
@@ -125,7 +125,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="YkV-D4-ddd" userLabel="PresenceIndicator" customClass="RoundedTextField">
- <rect key="frame" x="47" y="6" width="14" height="14"/>
+ <rect key="frame" x="48" y="6" width="14" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="9.5" id="IdR-WT-Pvg"/>
<constraint firstAttribute="height" constant="13.5" id="dO4-wg-jEC"/>
@@ -314,11 +314,11 @@
</outlineView>
</subviews>
</clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="OkJ-yp-L3b">
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="OkJ-yp-L3b">
<rect key="frame" x="1" y="119" width="224" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="obv-Hw-mDJ">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="obv-Hw-mDJ">
<rect key="frame" x="225" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
@@ -430,13 +430,6 @@
<constraint firstAttribute="height" constant="172" id="hCN-uz-Nmc"/>
</constraints>
</customView>
- <customView focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="tSW-YT-asL">
- <rect key="frame" x="0.0" y="0.0" width="728" height="658"/>
- <constraints>
- <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="340" id="5yo-rb-X1O"/>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="725" id="ccX-uq-zuj"/>
- </constraints>
- </customView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dZR-JL-MY4">
<rect key="frame" x="264" y="229" width="200" height="200"/>
<constraints>
@@ -483,7 +476,7 @@
</connections>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f62-JV-dgr">
- <rect key="frame" x="147" y="175" width="225" height="75"/>
+ <rect key="frame" x="148" y="175" width="225" height="75"/>
<constraints>
<constraint firstAttribute="height" constant="75" id="mWM-v0-n2w"/>
<constraint firstAttribute="width" constant="225" id="paw-4z-Zbv"/>
@@ -552,6 +545,13 @@
<constraint firstItem="VJ1-xk-v5e" firstAttribute="top" secondItem="f62-JV-dgr" secondAttribute="bottom" constant="8" id="zNb-f8-m6q"/>
</constraints>
</customView>
+ <customView focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="tSW-YT-asL">
+ <rect key="frame" x="0.0" y="0.0" width="728" height="658"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="340" id="5yo-rb-X1O"/>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="725" id="ccX-uq-zuj"/>
+ </constraints>
+ </customView>
</subviews>
<constraints>
<constraint firstItem="dZR-JL-MY4" firstAttribute="centerY" secondItem="Fzg-MB-mlx" secondAttribute="centerY" id="16A-gO-qJA"/>
@@ -617,7 +617,7 @@
</objects>
<resources>
<image name="NSShareTemplate" width="11" height="16"/>
- <image name="NSUser" width="32" height="32"/>
+ <image name="NSUser" width="128" height="128"/>
<image name="ic_action_block" width="72" height="72"/>
<image name="ic_action_cancel" width="72" height="72"/>
<image name="ic_person_add" width="48" height="48"/>