Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: support dark mode colors with pieces bar on macOS (#6959)

Browse Source 
Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>
This commit is contained in:
Dzmitry Neviadomski
2024-11-03 04:04:42 +03:00
committed by GitHub
parent 7978120c41
commit 73f9600326
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
macosx/ProgressBarView.mm
View File

@@ -6,6 +6,7 @@
#import "ProgressGradients.h" #import "ProgressGradients.h"
#import "TorrentTableView.h" #import "TorrentTableView.h"
#import "Torrent.h" #import "Torrent.h"
#import "NSApplicationAdditions.h"
static CGFloat const kPiecesTotalPercent = 0.6; static CGFloat const kPiecesTotalPercent = 0.6;
static NSInteger const kMaxPieces = 18 * 18; static NSInteger const kMaxPieces = 18 * 18;
@@ -142,10 +143,17 @@ static NSInteger const kMaxPieces = 18 * 18;
- (void)drawPiecesBar:(NSRect)barRect forTorrent:(Torrent*)torrent - (void)drawPiecesBar:(NSRect)barRect forTorrent:(Torrent*)torrent
{ {
//fill an all-white bar for magnet links // Fill a solid color bar for magnet links
if (torrent.magnet) if (torrent.magnet)
{
if (NSApp.darkMode)
{
[NSColor.controlColor set];
}
else
{ {
[[NSColor colorWithCalibratedWhite:1.0 alpha:[self.fDefaults boolForKey:@"SmallView"] ? 0.25 : 1.0] set]; [[NSColor colorWithCalibratedWhite:1.0 alpha:[self.fDefaults boolForKey:@"SmallView"] ? 0.25 : 1.0] set];
}
NSRectFillUsingOperation(barRect, NSCompositingOperationSourceOver); NSRectFillUsingOperation(barRect, NSCompositingOperationSourceOver);
return; return;
} }
@@ -166,6 +174,8 @@ static NSInteger const kMaxPieces = 18 * 18;
NSIndexSet* previousFinishedIndexes = torrent.previousFinishedPieces; NSIndexSet* previousFinishedIndexes = torrent.previousFinishedPieces;
NSMutableIndexSet* finishedIndexes = [NSMutableIndexSet indexSet]; NSMutableIndexSet* finishedIndexes = [NSMutableIndexSet indexSet];
NSColor* const pieceBgColor = NSApp.darkMode ? NSColor.controlColor : NSColor.whiteColor;
for (int i = 0; i < pieceCount; i++) for (int i = 0; i < pieceCount; i++)
{ {
NSColor* pieceColor; NSColor* pieceColor;
@@ -183,7 +193,7 @@ static NSInteger const kMaxPieces = 18 * 18;
} }
else else
{ {
pieceColor = [NSColor.whiteColor blendedColorWithFraction:piecesPercent[i] ofColor:self.fBluePieceColor]; pieceColor = [pieceBgColor blendedColorWithFraction:piecesPercent[i] ofColor:self.fBluePieceColor];
} }
//it's faster to just set color instead of checking previous color //it's faster to just set color instead of checking previous color