Theme/dimmable secondary columns (#554)

tiagof · web-flow · commit 92293332e81f · 2025-04-05T11:53:07.000+01:00
* Allows configuring secondary columns' opacity via theme parameter * a better label? * clang format * refactor as per #554 (comment) * Skip calculating secondary color when opacity is 100% * clang format
diff --git a/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.h b/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.h
@@ -91,6 +91,7 @@ class SWIFT_UNSAFE_REFERENCE Theme
     // File Panels --> List presentation settings //////////////////////////////////////////////////
     NSFont *FilePanelsListFont() const noexcept;
     unsigned FilePanelsListRowVerticalPadding() const noexcept;
+    unsigned FilePanelsListSecondaryColumnsOpacity() const noexcept;
     NSColor *FilePanelsListGridColor() const noexcept;
     NSFont *FilePanelsListHeaderFont() const noexcept;
     NSColor *FilePanelsListHeaderBackgroundColor() const noexcept;
diff --git a/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.mm b/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.mm
@@ -45,6 +45,7 @@
     NSColor *m_FilePanelsTabsPictogramColor;
     NSFont *m_FilePanelsListFont;
     unsigned m_FilePanelsListRowVerticalPadding;
+    unsigned m_FilePanelsListSecondaryColumnsOpacity;
     NSColor *m_FilePanelsListGridColor;
     NSFont *m_FilePanelsListHeaderFont;
     NSColor *m_FilePanelsListHeaderBackgroundColor;
@@ -162,6 +163,7 @@
 
     I->m_FilePanelsListFont = ExtractFont("filePanelsListFont");
     I->m_FilePanelsListRowVerticalPadding = ExtractUInt("filePanelsListRowVerticalPadding");
+    I->m_FilePanelsListSecondaryColumnsOpacity = ExtractUInt("filePanelsListSecondaryColumnsOpacity");
     I->m_FilePanelsListGridColor = ExtractColor("filePanelsListGridColor");
 
     I->m_FilePanelsHeaderFont = ExtractFont("filePanelsHeaderFont");
@@ -281,6 +283,11 @@
     return I->m_FilePanelsListRowVerticalPadding;
 }
 
+unsigned Theme::FilePanelsListSecondaryColumnsOpacity() const noexcept
+{
+    return I->m_FilePanelsListSecondaryColumnsOpacity;
+}
+
 NSColor *Theme::FilePanelsListFocusedActiveRowBackgroundColor() const noexcept
 {
     return I->m_FilePanelsListFocusedActiveRowBackgroundColor;
diff --git a/Source/NimbleCommander/NimbleCommander/Core/Theming/ThemesManager.mm b/Source/NimbleCommander/NimbleCommander/Core/Theming/ThemesManager.mm
@@ -60,6 +60,7 @@ static constexpr auto make_array_n(T &&value)
     {"filePanelsFooterActiveBackgroundColor", TMN::FilePanelsFooter},
     {"filePanelsFooterInactiveBackgroundColor", TMN::FilePanelsFooter},
     {"filePanelsListFont", TMN::FilePanelsList},
+    {"filePanelsListSecondaryColumnsOpacity", TMN::FilePanelsList},
     {"filePanelsListRowVerticalPadding", TMN::FilePanelsList},
     {"filePanelsListGridColor", TMN::FilePanelsList},
     {"filePanelsListHeaderFont", TMN::FilePanelsList},
diff --git a/Source/NimbleCommander/NimbleCommander/Preferences/PreferencesWindowThemesTabModel.mm b/Source/NimbleCommander/NimbleCommander/Preferences/PreferencesWindowThemesTabModel.mm
@@ -135,6 +135,7 @@ - (instancetype)initWithTitle:(NSString *)_title andChildren:(NSArray *)_childre
     auto fp_list_nodes = @[
         SpawnFontNode(@"Text font", "filePanelsListFont"),
         SpawnIntNode(@"Row vertical padding", "filePanelsListRowVerticalPadding"),
+        SpawnIntNode(@"Secondary text opacity (%)", "filePanelsListSecondaryColumnsOpacity"),
         SpawnColorNode(@"Grid color", "filePanelsListGridColor"),
         SpawnFontNode(@"Header font", "filePanelsListHeaderFont"),
         SpawnColorNode(@"Header background", "filePanelsListHeaderBackgroundColor"),
diff --git a/Source/NimbleCommander/NimbleCommander/Resources/Config.json b/Source/NimbleCommander/NimbleCommander/Resources/Config.json
@@ -587,6 +587,7 @@
                       
                       /* File Panels -> List settings */
                       "filePanelsListFont": "@systemFont, 13",
+                      "filePanelsListSecondaryColumnsOpacity": "100",
                       "filePanelsListRowVerticalPadding": "0",
                       "filePanelsListGridColor": "@clearColor",
                       "filePanelsListHeaderFont": "@systemFont, 11",
@@ -710,6 +711,7 @@
                       
                       /* File Panels -> List settings */
                       "filePanelsListFont": "@systemFont, 13",
+                      "filePanelsListSecondaryColumnsOpacity": "100",
                       "filePanelsListRowVerticalPadding": "0",
                       "filePanelsListGridColor": "@clearColor",
                       "filePanelsListHeaderFont": "@systemFont, 11",
@@ -850,6 +852,7 @@
                       
                       /* File Panels -> List settings */
                       "filePanelsListFont": "Menlo-Regular, 13",
+                      "filePanelsListSecondaryColumnsOpacity": "100",
                       "filePanelsListRowVerticalPadding": "0",
                       "filePanelsListGridColor": "#00FFFF",
                       "filePanelsListHeaderFont": "Menlo-Regular, 13",
@@ -964,6 +967,7 @@
                         "filePanelsFooterActiveBackgroundColor": "#FFFFFF",
                         "filePanelsFooterInactiveBackgroundColor": "#E8E8E8",
                         "filePanelsListFont": "@systemFont, 13",
+                        "filePanelsListSecondaryColumnsOpacity": "100",
                         "filePanelsListRowVerticalPadding": "0",
                         "filePanelsListGridColor": "#FFFFFF00",
                         "filePanelsListHeaderFont": "@systemFont, 11",
@@ -1072,6 +1076,7 @@
                         "filePanelsFooterActiveBackgroundColor": "#353535",
                         "filePanelsFooterInactiveBackgroundColor": "#1D1D1D",
                         "filePanelsListFont": "@systemFont, 13",
+                        "filePanelsListSecondaryColumnsOpacity": "100",
                         "filePanelsListGridColor": "#1D1D1D",
                         "filePanelsListRowVerticalPadding": "0",
                         "filePanelsListHeaderFont": "@systemFont, 11",
diff --git a/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewDateTimeView.mm b/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewDateTimeView.mm
@@ -164,7 +164,7 @@ - (void)drawRect:(NSRect) [[maybe_unused]] _rect
             [PanelListViewTableView drawVerticalSeparatorForView:self];
 
             if( m_Line ) {
-                CGContextSetFillColorWithColor(context, rv.rowTextColor.CGColor);
+                CGContextSetFillColorWithColor(context, rv.rowSecondaryTextColor.CGColor);
                 CGContextSetTextPosition(context, geometry.LeftInset(), geometry.TextBaseLine());
                 CGContextSetTextDrawingMode(context, kCGTextFill);
                 CTLineDraw(m_Line, context);
diff --git a/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewExtensionView.mm b/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewExtensionView.mm
@@ -69,9 +69,10 @@ - (void)buildPresentation
         PanelListViewRowView *row_view = static_cast<PanelListViewRowView *>(self.superview);
         if( !row_view )
             return;
+
         NSDictionary *attrs = @{
             NSFontAttributeName: row_view.listView.font,
-            NSForegroundColorAttributeName: row_view.rowTextColor,
+            NSForegroundColorAttributeName: row_view.rowSecondaryTextColor,
             NSParagraphStyleAttributeName: g_Style
         };
         auto attr_str = [[NSMutableAttributedString alloc] initWithString:m_Extension attributes:attrs];
@@ -96,7 +97,7 @@ - (void)drawRect:(NSRect) [[maybe_unused]] _rect
             if( m_Line ) {
                 const auto geometry = lv.geometry;
                 const auto context = NSGraphicsContext.currentContext.CGContext;
-                CGContextSetFillColorWithColor(context, rv.rowTextColor.CGColor);
+                CGContextSetFillColorWithColor(context, rv.rowSecondaryTextColor.CGColor);
                 CGContextSetTextPosition(context, geometry.LeftInset(), geometry.TextBaseLine());
                 CGContextSetTextDrawingMode(context, kCGTextFill);
                 CTLineDraw(m_Line.get(), context);
diff --git a/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewRowView.h b/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewRowView.h
@@ -18,6 +18,7 @@
 @property(nonatomic, weak) PanelListView *listView;
 @property(nonatomic, readonly) NSColor *rowBackgroundColor;
 @property(nonatomic, readonly) NSColor *rowTextColor;
+@property(nonatomic, readonly) NSColor *rowSecondaryTextColor;
 @property(nonatomic, readonly) NSColor *tagAccentColor; // may return nil when no accent should be drawn
 @property(nonatomic) bool panelActive;
 @property(nonatomic) int itemIndex;
diff --git a/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewRowView.mm b/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewRowView.mm
@@ -22,6 +22,7 @@ @implementation PanelListViewRowView {
     data::ItemVolatileData m_VD;
     NSColor *m_RowColor;
     NSColor *m_TextColor;
+    NSColor *m_TextSecondaryColor;
     NSColor *m_TagAccentColor;
     int m_ItemIndex;
     bool m_PanelActive;
@@ -30,6 +31,7 @@ @implementation PanelListViewRowView {
 }
 @synthesize rowBackgroundColor = m_RowColor;
 @synthesize rowTextColor = m_TextColor;
+@synthesize rowSecondaryTextColor = m_TextSecondaryColor;
 @synthesize tagAccentColor = m_TagAccentColor;
 @synthesize itemIndex = m_ItemIndex;
 @synthesize item = m_Item;
@@ -46,6 +48,7 @@ - (id)initWithItem:(VFSListingItem)_item
         m_ItemIndex = 0;
         m_RowColor = NSColor.whiteColor;
         m_TextColor = NSColor.blackColor;
+        m_TextSecondaryColor = NSColor.blackColor;
         self.selected = false;
         [self updateColors];
         [self registerForDraggedTypes:PanelView.acceptedDragAndDropTypes];
@@ -249,6 +252,11 @@ - (void)updateColors
     auto new_row_fg_color = [self findCurrentTextColor];
     if( new_row_fg_color != m_TextColor ) {
         m_TextColor = new_row_fg_color;
+
+        if( const unsigned opacity = nc::CurrentTheme().FilePanelsListSecondaryColumnsOpacity(); opacity < 100 )
+            m_TextSecondaryColor = [m_TextColor colorWithAlphaComponent:static_cast<double>(opacity) / 100.];
+        else
+            m_TextSecondaryColor = m_TextColor;
         colors_has_changed = true;
     }
 
diff --git a/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewSizeView.mm b/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewSizeView.mm
@@ -144,7 +144,7 @@ - (void)buildPresentation
     if( auto row_view = nc::objc_cast<PanelListViewRowView>(self.superview) ) {
         m_TextAttributes = @{
             NSFontAttributeName: row_view.listView.font,
-            NSForegroundColorAttributeName: row_view.rowTextColor,
+            NSForegroundColorAttributeName: row_view.rowSecondaryTextColor,
             NSParagraphStyleAttributeName: PStyle()
         };
         [self setNeedsDisplay:true];
diff --git a/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewTagsView.mm b/Source/NimbleCommander/NimbleCommander/States/FilePanels/List/PanelListViewTagsView.mm
@@ -73,9 +73,10 @@ - (void)buildPresentation
         PanelListViewRowView *row_view = static_cast<PanelListViewRowView *>(self.superview);
         if( !row_view )
             return;
+
         NSDictionary *attrs = @{
             NSFontAttributeName: row_view.listView.font,
-            NSForegroundColorAttributeName: row_view.rowTextColor,
+            NSForegroundColorAttributeName: row_view.rowSecondaryTextColor,
             NSParagraphStyleAttributeName: g_Style
         };
 
