mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix group icon border (#3094)

This commit is contained in:
A Cœur 2022-05-27 05:04:20 +08:00 committed by GitHub
parent 51760bd5c1
commit b033b6598e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/CMakeLists.txt
View File

@ -249,7 +249,6 @@ set(${PROJECT_NAME}_HIDPI_IMAGES
Globe
GreenDotFlat
Groups
GroupsNoneTemplate
InfoActivity
InfoFiles
InfoGeneral

71
macosx/GroupsController.mm
View File

@ -4,8 +4,10 @@
#import "GroupsController.h"
#import "NSMutableArrayAdditions.h"
#import "NSApplicationAdditions.h"
#define ICON_WIDTH 16.0
#define BORDER_WIDTH 1.25
#define ICON_WIDTH_SMALL 12.0
@interface GroupsController ()
@ -138,7 +140,7 @@ GroupsController* fGroupsInstance = nil;
- (NSImage*)imageForIndex:(NSInteger)index
{
NSInteger orderIndex = [self rowValueForIndex:index];
return orderIndex != -1 ? [self imageForGroup:self.fGroups[orderIndex]] : [NSImage imageNamed:@"GroupsNoneTemplate"];
return orderIndex != -1 ? [self imageForGroup:self.fGroups[orderIndex]] : [self imageForGroupNone];
}
- (NSColor*)colorForIndex:(NSInteger)index
@ -299,7 +301,7 @@ GroupsController* fGroupsInstance = nil;
item.target = target;
item.tag = -1;
NSImage* icon = [NSImage imageNamed:@"GroupsNoneTemplate"];
NSImage* icon = [self imageForGroupNone];
if (small)
{
icon = [icon copy];
@ -369,33 +371,64 @@ GroupsController* fGroupsInstance = nil;
[NSUserDefaults.standardUserDefaults setObject:[NSKeyedArchiver archivedDataWithRootObject:groups] forKey:@"GroupDicts"];
}
- (NSImage*)imageForGroupNone
{
static NSImage* icon;
if (icon)
{
return icon;
}
icon = [NSImage imageWithSize:NSMakeSize(ICON_WIDTH, ICON_WIDTH) flipped:NO drawingHandler:^BOOL(NSRect rect) {
//shape
rect = NSInsetRect(rect, BORDER_WIDTH / 2, BORDER_WIDTH / 2);
NSBezierPath* bp = [NSBezierPath bezierPathWithOvalInRect:rect];
bp.lineWidth = BORDER_WIDTH;
//border
// code reference for dashed style
//CGFloat dashAndGapLength = M_PI * rect.size.width / 8;
//CGFloat pattern[2] = { dashAndGapLength * .5, dashAndGapLength * .5 };
//[bp setLineDash:pattern count:2 phase:0];
[NSColor.controlTextColor setStroke];
[bp stroke];
return YES;
}];
[icon setTemplate:YES];
return icon;
}
- (NSImage*)imageForGroup:(NSMutableDictionary*)dict
{
NSImage* image;
if ((image = dict[@"Icon"]))
NSImage* icon;
if ((icon = dict[@"Icon"]))
{
return image;
return icon;
}
NSColor* color = dict[@"Color"];
NSRect rect = NSMakeRect(0.0, 0.0, ICON_WIDTH, ICON_WIDTH);
icon = [NSImage imageWithSize:NSMakeSize(ICON_WIDTH, ICON_WIDTH) flipped:NO drawingHandler:^BOOL(NSRect rect) {
//shape
rect = NSInsetRect(rect, BORDER_WIDTH / 2, BORDER_WIDTH / 2);
NSBezierPath* bp = [NSBezierPath bezierPathWithOvalInRect:rect];
bp.lineWidth = BORDER_WIDTH;
NSImage* icon = [[NSImage alloc] initWithSize:rect.size];
//border
CGFloat fractionOfBlendedColor = [NSApp isDarkMode] ? 0.15 : 0.3;
NSColor* borderColor = [color blendedColorWithFraction:fractionOfBlendedColor ofColor:NSColor.controlTextColor];
[borderColor setStroke];
[bp stroke];
[icon lockFocus];
//inside
[color setFill];
[bp fill];
//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]
endingColor:color];
[gradient drawInBezierPath:bp angle:0.0];
//inside
[color setFill];
[bp fill];
[icon unlockFocus];
return YES;
}];
dict[@"Icon"] = icon;

21
macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/Contents.json vendored
View File

@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "mac",
"filename" : "GroupsNoneTemplate.png",
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "GroupsNoneTemplate@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}

BIN
macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/GroupsNoneTemplate.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 154 B

BIN
macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/GroupsNoneTemplate@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 262 B

2
macosx/da.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Ingen" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Ingen" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/de.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Keine" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Keine" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/en.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="None" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="None" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/es.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Ninguno" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Ninguno" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/fr.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Aucun" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Aucun" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/it.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Nessuno" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Nessuno" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/nl.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Geen" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Geen" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/pt_PT.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Nenhum" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Nenhum" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/ru.lproj/AddMagnetWindow.xib
View File

@ -109,7 +109,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="None" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="None" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>

2
macosx/tr.lproj/AddMagnetWindow.xib
View File

@ -110,7 +110,7 @@ Gw
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="35">
<items>
<menuItem title="Hiçbiri" state="on" image="GroupsNoneTemplate" id="2zq-5y-smI">
<menuItem title="Hiçbiri" state="on" image="circle.dashed" catalog="system" id="2zq-5y-smI">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>