From c32161f7ca77928094536f21c8e93c367c301f41 Mon Sep 17 00:00:00 2001 From: Gary Elshaw <69029666+GaryElshaw@users.noreply.github.com> Date: Tue, 8 Nov 2022 08:21:49 +1300 Subject: [PATCH] feat: place upload above download in macOS badge (#4055) --- macosx/BadgeView.mm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/macosx/BadgeView.mm b/macosx/BadgeView.mm index 6c4cc7653..083d12c1c 100644 --- a/macosx/BadgeView.mm +++ b/macosx/BadgeView.mm @@ -54,19 +54,19 @@ static CGFloat const kBetweenPadding = 2.0; BOOL const upload = self.fUploadRate >= 0.1; BOOL const download = self.fDownloadRate >= 0.1; CGFloat bottom = 0.0; - if (upload) - { - NSImage* uploadBadge = [NSImage imageNamed:@"UploadBadge"]; - [self badge:uploadBadge string:[NSString stringForSpeedAbbrev:self.fUploadRate] atHeight:bottom]; - - if (download) - { - bottom += uploadBadge.size.height + kBetweenPadding; //download rate above upload rate - } - } if (download) { - [self badge:[NSImage imageNamed:@"DownloadBadge"] string:[NSString stringForSpeedAbbrev:self.fDownloadRate] atHeight:bottom]; + NSImage* downloadBadge = [NSImage imageNamed:@"DownloadBadge"]; + [self badge:downloadBadge string:[NSString stringForSpeedAbbrev:self.fDownloadRate] atHeight:bottom]; + + if (upload) + { + bottom += downloadBadge.size.height + kBetweenPadding; //upload rate above download rate + } + } + if (upload) + { + [self badge:[NSImage imageNamed:@"UploadBadge"] string:[NSString stringForSpeedAbbrev:self.fUploadRate] atHeight:bottom]; } }