Remove deprecated min/max toolbar item size

transmission · Nov 18, 2020 · 0916844 · 0916844
1 parent 31413df
commit 0916844
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/macosx/Controller.m b/macosx/Controller.m
@@ -3634,9 +3634,13 @@ - (id) toolbarButtonWithIdentifier: (NSString *) ident forToolbarButtonClass:(Cl
 
     [item setView: button];
 
-    const NSSize buttonSize = NSMakeSize(36.0, 25.0);
-    [item setMinSize: buttonSize];
-    [item setMaxSize: buttonSize];
+    if (@available(macOS 11.0, *)) {
+        // not needed
+    } else {
+        const NSSize buttonSize = NSMakeSize(36.0, 25.0);
+        [item setMinSize: buttonSize];
+        [item setMaxSize: buttonSize];
+    }
 
     return item;
 }
@@ -3729,9 +3733,13 @@ - (NSToolbarItem *) toolbar: (NSToolbar *) toolbar itemForItemIdentifier: (NSStr
         [segmentedControl setSegmentCount: 2];
         [segmentedCell setTrackingMode: NSSegmentSwitchTrackingMomentary];
 
-        const NSSize groupSize = NSMakeSize(72.0, 25.0);
-        [groupItem setMinSize: groupSize];
-        [groupItem setMaxSize: groupSize];
+        if (@available(macOS 11.0, *)) {
+            // not needed
+        } else {
+            const NSSize groupSize = NSMakeSize(72.0, 25.0);
+            [groupItem setMinSize: groupSize];
+            [groupItem setMaxSize: groupSize];
+        }
 
         [groupItem setLabel: NSLocalizedString(@"Apply All", "All toolbar item -> label")];
         [groupItem setPaletteLabel: NSLocalizedString(@"Pause / Resume All", "All toolbar item -> palette label")];
@@ -3774,9 +3782,13 @@ - (NSToolbarItem *) toolbar: (NSToolbar *) toolbar itemForItemIdentifier: (NSStr
         [segmentedControl setSegmentCount: 2];
         [segmentedCell setTrackingMode: NSSegmentSwitchTrackingMomentary];
 
-        const NSSize groupSize = NSMakeSize(72.0, 25.0);
-        [groupItem setMinSize: groupSize];
-        [groupItem setMaxSize: groupSize];
+        if (@available(macOS 11.0, *)) {
+            // not needed
+        } else {
+            const NSSize groupSize = NSMakeSize(72.0, 25.0);
+            [groupItem setMinSize: groupSize];
+            [groupItem setMaxSize: groupSize];
+        }
 
         [groupItem setLabel: NSLocalizedString(@"Apply Selected", "Selected toolbar item -> label")];
         [groupItem setPaletteLabel: NSLocalizedString(@"Pause / Resume Selected", "Selected toolbar item -> palette label")];