mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

Updating group icon style for newer macOS (#3065)

Browse source
This commit is contained in:
Antoine Cœur 2022-05-14 08:54:10 +08:00 committed by GitHub
parent 7ab2fbfbd6
commit 67f6562ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
macosx/GroupsController.mm
View file

@ -67,25 +67,25 @@ GroupsController* fGroupsInstance = nil;
{ {
//default groups //default groups
NSMutableDictionary* red = [NSMutableDictionary NSMutableDictionary* red = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.redColor, @"Color", NSLocalizedString(@"Red", "Groups -> Name"), @"Name", @0, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemRedColor, @"Color", NSLocalizedString(@"Red", "Groups -> Name"), @"Name", @0, @"Index", nil];
NSMutableDictionary* orange = [NSMutableDictionary NSMutableDictionary* orange = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.orangeColor, @"Color", NSLocalizedString(@"Orange", "Groups -> Name"), @"Name", @1, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemOrangeColor, @"Color", NSLocalizedString(@"Orange", "Groups -> Name"), @"Name", @1, @"Index", nil];
NSMutableDictionary* yellow = [NSMutableDictionary NSMutableDictionary* yellow = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.yellowColor, @"Color", NSLocalizedString(@"Yellow", "Groups -> Name"), @"Name", @2, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemYellowColor, @"Color", NSLocalizedString(@"Yellow", "Groups -> Name"), @"Name", @2, @"Index", nil];
NSMutableDictionary* green = [NSMutableDictionary NSMutableDictionary* green = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.greenColor, @"Color", NSLocalizedString(@"Green", "Groups -> Name"), @"Name", @3, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemGreenColor, @"Color", NSLocalizedString(@"Green", "Groups -> Name"), @"Name", @3, @"Index", nil];
NSMutableDictionary* blue = [NSMutableDictionary NSMutableDictionary* blue = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.blueColor, @"Color", NSLocalizedString(@"Blue", "Groups -> Name"), @"Name", @4, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemBlueColor, @"Color", NSLocalizedString(@"Blue", "Groups -> Name"), @"Name", @4, @"Index", nil];
NSMutableDictionary* purple = [NSMutableDictionary NSMutableDictionary* purple = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.purpleColor, @"Color", NSLocalizedString(@"Purple", "Groups -> Name"), @"Name", @5, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemPurpleColor, @"Color", NSLocalizedString(@"Purple", "Groups -> Name"), @"Name", @5, @"Index", nil];
NSMutableDictionary* gray = [NSMutableDictionary NSMutableDictionary* gray = [NSMutableDictionary
dictionaryWithObjectsAndKeys:NSColor.grayColor, @"Color", NSLocalizedString(@"Gray", "Groups -> Name"), @"Name", @6, @"Index", nil]; dictionaryWithObjectsAndKeys:NSColor.systemGrayColor, @"Color", NSLocalizedString(@"Gray", "Groups -> Name"), @"Name", @6, @"Index", nil];
_fGroups = [[NSMutableArray alloc] initWithObjects:red, orange, yellow, green, blue, purple, gray, nil]; _fGroups = [[NSMutableArray alloc] initWithObjects:red, orange, yellow, green, blue, purple, gray, nil];
[self saveGroups]; //make sure this is saved right away [self saveGroups]; //make sure this is saved right away
@ -377,25 +377,23 @@ GroupsController* fGroupsInstance = nil;
return image; return image;
} }
NSColor* color = dict[@"Color"];
NSRect rect = NSMakeRect(0.0, 0.0, ICON_WIDTH, ICON_WIDTH); NSRect rect = NSMakeRect(0.0, 0.0, ICON_WIDTH, ICON_WIDTH);
NSBezierPath* bp = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:3.0 yRadius:3.0];
NSImage* icon = [[NSImage alloc] initWithSize:rect.size]; NSImage* icon = [[NSImage alloc] initWithSize:rect.size];
NSColor* color = dict[@"Color"];
[icon lockFocus]; [icon lockFocus];
//border //border
NSBezierPath* bp = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:rect.size.width / 2 yRadius:rect.size.width / 2];
NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:[color blendedColorWithFraction:0.45 ofColor:NSColor.whiteColor] NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:[color blendedColorWithFraction:0.45 ofColor:NSColor.whiteColor]
endingColor:color]; endingColor:color];
[gradient drawInBezierPath:bp angle:270.0]; [gradient drawInBezierPath:bp angle:0.0];
//inside //inside
bp = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect, 1.0, 1.0) xRadius:3.0 yRadius:3.0]; [color setFill];
gradient = [[NSGradient alloc] initWithStartingColor:[color blendedColorWithFraction:0.75 ofColor:NSColor.whiteColor] [bp fill];
endingColor:[color blendedColorWithFraction:0.2 ofColor:NSColor.whiteColor]];
[gradient drawInBezierPath:bp angle:270.0];
[icon unlockFocus]; [icon unlockFocus];