From 0cd68ff8f81adc4673a8cd1ee33362fdf39a8d29 Mon Sep 17 00:00:00 2001 From: cacaodev Date: Sat, 14 Mar 2015 20:02:43 +0100 Subject: [PATCH] FIXED: selection update when segmentCount changes n->0 or 0->n If the segment count is set to 0, the [self selectedSegment] now correctly return -1 (like cocoa). If the segment count is set to n from 0, the first segment is selected. See manual test. --- AppKit/CPSegmentedControl.j | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AppKit/CPSegmentedControl.j b/AppKit/CPSegmentedControl.j index fca46a536..cb2c025c5 100644 --- a/AppKit/CPSegmentedControl.j +++ b/AppKit/CPSegmentedControl.j @@ -180,7 +180,11 @@ CPSegmentSwitchTrackingMomentary = 2; { var count = [self segmentCount]; - if (_selectedSegment >= count) + if (count == 0) + _selectedSegment = -1; + else if (_selectedSegment < 0) + [self setSelectedSegment:0]; + else if (_selectedSegment >= count) [self setSelectedSegment:count - 1]; }