diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index b3c7182a8..0ffcb8073 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -767,9 +767,6 @@ static void removeKeRangerRansomware()
{
[self showInfo:nil];
}
-
- //redraw filterbar to avoid clipping
- [NSNotificationCenter.defaultCenter postNotificationName:@"ResizeBar" object:nil];
}
- (void)applicationDidFinishLaunching:(NSNotification*)notification
@@ -4948,7 +4945,7 @@ static void removeKeRangerRansomware()
[self.fStackView insertArrangedSubview:self.fFilterBar.view atIndex:idx];
NSDictionary* views = @{ @"fFilterBar" : self.fFilterBar.view };
- [self.fStackView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[fFilterBar(==21)]" options:0
+ [self.fStackView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[fFilterBar(==23)]" options:0
metrics:nil
views:views]];
diff --git a/macosx/FilterBar.xib b/macosx/FilterBar.xib
index 94e51095d..790edb20e 100644
--- a/macosx/FilterBar.xib
+++ b/macosx/FilterBar.xib
@@ -25,20 +25,11 @@
-
-
+
-
+
+
+
@@ -60,57 +51,100 @@
-
+
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
@@ -121,18 +155,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
@@ -84,6 +79,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/macosx/StatusBarController.mm b/macosx/StatusBarController.mm
index 0b04226c3..90b695607 100644
--- a/macosx/StatusBarController.mm
+++ b/macosx/StatusBarController.mm
@@ -32,8 +32,6 @@ typedef NS_ENUM(unsigned int, statusTag) {
@property(nonatomic) CGFloat fPreviousDownloadRate;
@property(nonatomic) CGFloat fPreviousUploadRate;
-- (void)resizeStatusButton;
-
@end
@implementation StatusBarController
@@ -70,9 +68,6 @@ typedef NS_ENUM(unsigned int, statusTag) {
//update when speed limits are changed
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(updateSpeedFieldsToolTips) name:@"SpeedLimitUpdate"
object:nil];
- [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(resizeStatusButton)
- name:NSWindowDidResizeNotification
- object:self.view.window];
}
- (void)dealloc
@@ -137,7 +132,6 @@ typedef NS_ENUM(unsigned int, statusTag) {
if (![self.fStatusButton.title isEqualToString:statusString])
{
self.fStatusButton.title = statusString;
- [self resizeStatusButton];
}
}
@@ -247,23 +241,4 @@ typedef NS_ENUM(unsigned int, statusTag) {
return YES;
}
-#pragma mark - Private
-
-- (void)resizeStatusButton
-{
- [self.fStatusButton sizeToFit];
-
- //width ends up being too long
- NSRect statusFrame = self.fStatusButton.frame;
- statusFrame.size.width -= 25.0;
-
- CGFloat const difference = NSMaxX(statusFrame) + 5.0 - NSMinX(self.fTotalDLImageView.frame);
- if (difference > 0.0)
- {
- statusFrame.size.width -= difference;
- }
-
- self.fStatusButton.frame = statusFrame;
-}
-
@end