Fix group icon border (#3094)

transmission · May 26, 2022 · b033b65 · b033b65
1 parent 51760bd
commit b033b65
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 51 deletions.
diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt
@@ -249,7 +249,6 @@ set(${PROJECT_NAME}_HIDPI_IMAGES
     Globe
     GreenDotFlat
     Groups
-    GroupsNoneTemplate
     InfoActivity
     InfoFiles
     InfoGeneral

diff --git a/macosx/GroupsController.mm b/macosx/GroupsController.mm
@@ -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 @@ - (void)setName:(NSString*)name forIndex:(NSInteger)index
 - (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 @@ - (NSMenu*)groupMenuWithTarget:(id)target action:(SEL)action isSmall:(BOOL)small
     item.target = target;
     item.tag = -1;
 
-    NSImage* icon = [NSImage imageNamed:@"GroupsNoneTemplate"];
+    NSImage* icon = [self imageForGroupNone];
     if (small)
     {
         icon = [icon copy];
@@ -369,33 +371,64 @@ - (void)saveGroups
     [NSUserDefaults.standardUserDefaults setObject:[NSKeyedArchiver archivedDataWithRootObject:groups] forKey:@"GroupDicts"];
 }
 
-- (NSImage*)imageForGroup:(NSMutableDictionary*)dict
+- (NSImage*)imageForGroupNone
 {
-    NSImage* image;
-    if ((image = dict[@"Icon"]))
+    static NSImage* icon;
+    if (icon)
     {
-        return image;
+        return icon;
     }
 
-    NSColor* color = dict[@"Color"];
+    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];
 
-    NSRect rect = NSMakeRect(0.0, 0.0, ICON_WIDTH, ICON_WIDTH);
+        return YES;
+    }];
+    [icon setTemplate:YES];
+
+    return icon;
+}
 
-    NSImage* icon = [[NSImage alloc] initWithSize:rect.size];
+- (NSImage*)imageForGroup:(NSMutableDictionary*)dict
+{
+    NSImage* icon;
+    if ((icon = dict[@"Icon"]))
+    {
+        return icon;
+    }
+
+    NSColor* color = dict[@"Color"];
 
-    [icon lockFocus];
+    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
-    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];
+        //border
+        CGFloat fractionOfBlendedColor = [NSApp isDarkMode] ? 0.15 : 0.3;
+        NSColor* borderColor = [color blendedColorWithFraction:fractionOfBlendedColor ofColor:NSColor.controlTextColor];
+        [borderColor setStroke];
+        [bp stroke];
 
-    //inside
-    [color setFill];
-    [bp fill];
+        //inside
+        [color setFill];
+        [bp fill];
 
-    [icon unlockFocus];
+        return YES;
+    }];
 
     dict[@"Icon"] = icon;
 

diff --git a/macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/Contents.json
diff --git a/macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/GroupsNoneTemplate.png b/macosx/Images/Images.xcassets/GroupsNoneTemplate.imageset/GroupsNoneTemplate.png
diff --git a/...sx/Images/Images.xcassets/GroupsNoneTemplate.imageset/GroupsNoneTemplate@2x.png b/...sx/Images/Images.xcassets/GroupsNoneTemplate.imageset/GroupsNoneTemplate@2x.png
diff --git a/macosx/da.lproj/AddMagnetWindow.xib b/macosx/da.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/de.lproj/AddMagnetWindow.xib b/macosx/de.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/en.lproj/AddMagnetWindow.xib b/macosx/en.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/es.lproj/AddMagnetWindow.xib b/macosx/es.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/fr.lproj/AddMagnetWindow.xib b/macosx/fr.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/it.lproj/AddMagnetWindow.xib b/macosx/it.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/nl.lproj/AddMagnetWindow.xib b/macosx/nl.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/pt_PT.lproj/AddMagnetWindow.xib b/macosx/pt_PT.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/ru.lproj/AddMagnetWindow.xib b/macosx/ru.lproj/AddMagnetWindow.xib
@@ -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>

diff --git a/macosx/tr.lproj/AddMagnetWindow.xib b/macosx/tr.lproj/AddMagnetWindow.xib
@@ -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>