Adjust the presentation to closer match what Finder does

mikekazakov · Jan 22, 2024 · b7c057e · b7c057e
1 parent 844730a
commit b7c057e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Source/Panel/include/Panel/UI/TagsPresentation.h b/Source/Panel/include/Panel/UI/TagsPresentation.h
@@ -8,7 +8,7 @@ namespace nc::panel {
 
 struct TrailingTagsInplaceDisplay {
     static constexpr int MaxDrawn = 3;
-    static constexpr int Diameter = 10;
+    static constexpr int Diameter = 9;
     static constexpr int Step = 5;
     static constexpr int Margin = 8;
 

diff --git a/Source/Panel/source/UI/TagsPresentation.mm b/Source/Panel/source/UI/TagsPresentation.mm
@@ -70,7 +70,7 @@
     if( num_colors_to_draw == 0 )
         return;
 
-    constexpr double radius = static_cast<double>(Diameter / 2);
+    constexpr double radius = static_cast<double>(Diameter) / 2.;
     constexpr double spacing = static_cast<double>(Step);
     static NSBezierPath *const circle = [] {
         NSBezierPath *circle = [NSBezierPath bezierPath];
@@ -81,33 +81,33 @@
     static NSBezierPath *const shadow = [] {
         NSBezierPath *shadow = [NSBezierPath bezierPath];
         [shadow appendBezierPathWithArcWithCenter:NSMakePoint(0., 0.) radius:radius + 1. startAngle:0 endAngle:360];
-        [shadow setLineWidth:1.];
+        [shadow setLineWidth:2.0];
         return shadow;
     }();
 
     NSGraphicsContext *currentContext = [NSGraphicsContext currentContext];
     for( ssize_t i = num_colors_to_draw - 1; i >= 0; --i ) {
         [currentContext saveGraphicsState];
 
-        auto colors = Color(colors_to_draw[i]);
-        [colors.first setFill];
-        if( _accent )
-            [_accent setStroke];
-        else
-            [colors.second setStroke];
-
         NSAffineTransform *tr = [NSAffineTransform transform];
         [tr translateXBy:_offset_x + i * spacing yBy:_view_height / 2.];
         [tr concat];
 
-        [circle fill];
-        [circle stroke];
-
         if( i < static_cast<ssize_t>(num_colors_to_draw) - 1 ) {
             [_background setStroke];
             [shadow stroke];
         }
 
+        auto colors = Color(colors_to_draw[i]);
+        [colors.first setFill];
+        if( _accent )
+            [_accent setStroke];
+        else
+            [colors.second setStroke];
+
+        [circle fill];
+        [circle stroke];
+
         [currentContext restoreGraphicsState];
     }
 }