Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update UI for Big Sur #37

Merged
merged 2 commits into from
Nov 19, 2020
Merged

Update UI for Big Sur #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed2e79c
* Make sidebar use rounded rect selection
greimers Jul 19, 2020
80866eb
Fix toolbar icons for Big Sur
greimers Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Source/Tincta.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
0E464D6123A51DE30099F4CD /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E464D5E23A51DE30099F4CD /* AppCenterAnalytics.framework */; };
0E464D6223A51DE30099F4CD /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E464D5F23A51DE30099F4CD /* AppCenterCrashes.framework */; };
0E464D6323A51DE30099F4CD /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E464D6023A51DE30099F4CD /* AppCenter.framework */; };
0E53F00924C462A900A0F693 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0E53F00824C462A900A0F693 /* Colors.xcassets */; };
0E7286D41A85726E008D6395 /* ColorSchemes in Resources */ = {isa = PBXBuildFile; fileRef = 0E7286D21A85726E008D6395 /* ColorSchemes */; };
0E7D0C3323DA3D94008B7E48 /* iconmonstr-iconic-font.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0E7D0C3123DA3D39008B7E48 /* iconmonstr-iconic-font.ttf */; };
0EA8209123DC7DE100671B5C /* TCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EA8209023DC7DE000671B5C /* TCBackgroundView.m */; };
Expand Down Expand Up @@ -110,6 +111,7 @@
0E464D5F23A51DE30099F4CD /* AppCenterCrashes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenterCrashes.framework; sourceTree = "<group>"; };
0E464D6023A51DE30099F4CD /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenter.framework; sourceTree = "<group>"; };
0E464D6423A51F030099F4CD /* AppCenterConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppCenterConfig.h; sourceTree = "<group>"; };
0E53F00824C462A900A0F693 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
0E7286D21A85726E008D6395 /* ColorSchemes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ColorSchemes; path = Tincta/ColorSchemes; sourceTree = "<group>"; };
0E7D0C3123DA3D39008B7E48 /* iconmonstr-iconic-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iconmonstr-iconic-font.ttf"; sourceTree = "<group>"; };
0E9FC5E41A6199B100B519EB /* Tincta AppStore-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tincta AppStore-Bridging-Header.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -327,6 +329,7 @@
95A5CF181358922D008CA186 /* Supporting Files */,
95A5CF3A135894DE008CA186 /* Icons */,
0E39E3422395B29B00EB5F86 /* icons.xcassets */,
0E53F00824C462A900A0F693 /* Colors.xcassets */,
);
path = Tincta;
sourceTree = "<group>";
Expand Down Expand Up @@ -615,6 +618,7 @@
95F1D04619AFA3C70022EA99 /* Credits.html in Resources */,
0E7286D41A85726E008D6395 /* ColorSchemes in Resources */,
0E39E3432395B29B00EB5F86 /* icons.xcassets in Resources */,
0E53F00924C462A900A0F693 /* Colors.xcassets in Resources */,
95F1D04B19AFA3C70022EA99 /* app_icon_running.icns in Resources */,
95F1D04C19AFA3C70022EA99 /* Syntax Definitions in Resources */,
95F1D04D19AFA3C70022EA99 /* Notification.xib in Resources */,
Expand Down Expand Up @@ -818,10 +822,11 @@
95F1D07919AFA3C70022EA99 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_EMPTY_BODY = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 4010;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down Expand Up @@ -861,10 +866,11 @@
95F1D07A19AFA3C70022EA99 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_EMPTY_BODY = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 4010;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down
38 changes: 38 additions & 0 deletions Source/Tincta/Colors.xcassets/Accent Color.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.600",
"green" : "0.420",
"red" : "0.520"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.600",
"green" : "0.420",
"red" : "0.520"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions Source/Tincta/Colors.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions Source/Tincta/Colors.xcassets/Toolbar Color.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.400",
"green" : "0.400",
"red" : "0.400"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.650",
"green" : "0.650",
"red" : "0.650"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
27 changes: 13 additions & 14 deletions Source/Tincta/MainMenu.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17132" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="1080" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17132"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -446,13 +446,13 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
<rect key="contentRect" x="284" y="137" width="787" height="511"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
<value key="minSize" type="size" width="600" height="450"/>
<view key="contentView" canDrawConcurrently="YES" id="372">
<view key="contentView" id="372">
<rect key="frame" x="0.0" y="0.0" width="787" height="511"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<splitView canDrawConcurrently="YES" focusRingType="none" fixedFrame="YES" autosaveName="splitViewAutosave" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="533">
<splitView focusRingType="none" fixedFrame="YES" autosaveName="splitViewAutosave" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="533">
<rect key="frame" x="0.0" y="20" width="787" height="491"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
Expand All @@ -463,19 +463,18 @@
<scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="52" horizontalPageScroll="10" verticalLineScroll="52" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" verticalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="546">
<rect key="frame" x="-1" y="0.0" width="202" height="492"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="qgS-Oo-H0L">
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="qgS-Oo-H0L">
<rect key="frame" x="0.0" y="0.0" width="202" height="492"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="52" id="550">
<tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="52" id="550">
<rect key="frame" x="0.0" y="0.0" width="202" height="492"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn editable="NO" width="202" minWidth="40" maxWidth="1000" id="551">
<tableColumn editable="NO" width="170" minWidth="40" maxWidth="1000" id="551">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Sidebar">
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
Expand Down Expand Up @@ -512,11 +511,11 @@
<scrollView focusRingType="none" fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" verticalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="985">
<rect key="frame" x="0.0" y="2" width="585" height="489"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="1qE-rM-jPW">
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="1qE-rM-jPW">
<rect key="frame" x="0.0" y="0.0" width="585" height="489"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView ambiguous="YES" importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" id="986" customClass="TCTextView">
<textView importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" id="986" customClass="TCTextView">
<rect key="frame" x="0.0" y="0.0" width="585" height="489"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -551,11 +550,11 @@
<outlet property="delegate" destination="544" id="580"/>
</connections>
</splitView>
<customView canDrawConcurrently="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="559" customClass="TCStatusView">
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="559" customClass="TCStatusView">
<rect key="frame" x="0.0" y="0.0" width="787" height="22"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<textField canDrawConcurrently="YES" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="567">
<textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="567">
<rect key="frame" x="17" y="3" width="752" height="14"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Label" usesSingleLineMode="YES" id="568">
Expand All @@ -579,7 +578,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="roundTextured" title="Item 1" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" selectedItem="963" id="961">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="962">
<items>
<menuItem title="Item 1" state="on" id="963"/>
Expand Down
19 changes: 19 additions & 0 deletions Source/Tincta/MainWindowController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ - (void)awakeFromNib {
isAwakeFromNib = YES;

[[self window] setAllowsConcurrentViewDrawing:YES];
if (@available(macOS 10.16, *)) {
[[self window] setToolbarStyle: NSWindowToolbarStyleExpanded];
}

self.openUrlBookmarks = [NSMutableSet set];
recentItemsBookmarks = [NSMutableArray arrayWithArray:[TCADefaultsHelper getRecentItemsBookmarks]];
Expand Down Expand Up @@ -64,6 +67,22 @@ - (void)awakeFromNib {
[self.toolbarPreferencesItemCell setFont: iconFont];
[self.toolbarOpenBrowserItemCell setFont: iconFont];
[self.toolbarPrintItemCell setFont: iconFont];

if (@available(macOS 10.16, *)) {
NSColor* iconColor = [NSColor colorNamed:@"Toolbar Color"];

[self.toolbarSearchItemCell setContentTintColor: iconColor];
[self.toolbarNewItemCell setContentTintColor: iconColor];
[self.toolbarOpenItemCell setContentTintColor: iconColor];
[self.toolbarCloseItemCell setContentTintColor: iconColor];
[self.toolbarSaveItemCell setContentTintColor: iconColor];
[self.toolbarPreferencesItemCell setContentTintColor: iconColor];
[self.toolbarOpenBrowserItemCell setContentTintColor: iconColor];
[self.toolbarPrintItemCell setContentTintColor: iconColor];
[self.toolbarInvisiblesItemCell setContentTintColor: iconColor];
[self.toolbarToggleCaseItemCell setContentTintColor: iconColor];
}


// These just use text. Sizes are deliberately different
[self.toolbarToggleCaseItemCell setFont: [NSFont systemFontOfSize:21]];
Expand Down
Loading