diff --git a/ChangeLog b/ChangeLog index 0dc3f1f69..7de9cf856 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 24 Felipe A. Rodriguez + + * NSSliderCell.m: knobRectFlipped: fix draw bugs in slider.app example. + Mon Feb 22 8:30:00 1999 Richard Frith-Macdonald * NSView.m: Tidied coordinate conversion code to use new system with diff --git a/Source/NSSliderCell.m b/Source/NSSliderCell.m index 975a97627..52147231a 100644 --- a/Source/NSSliderCell.m +++ b/Source/NSSliderCell.m @@ -81,28 +81,30 @@ - (NSRect)knobRectFlipped:(BOOL)flipped { - NSImage* image = [_knobCell image]; - NSSize size; - NSPoint origin; - float floatValue; +NSImage* image = [_knobCell image]; +NSSize size; +NSPoint origin; +float floatValue; - if (_isVertical && flipped) - _floatValue = _maxValue + _minValue - _floatValue; - - floatValue = (_floatValue - _minValue) / (_maxValue - _minValue); - - size = [image size]; - - if (_isVertical) { - origin.x = 0; - origin.y = (_trackRect.size.height - size.height) * floatValue; - } - else { - origin.x = (_trackRect.size.width - size.width) * floatValue; - origin.y = 0; - } - - return NSMakeRect (origin.x, origin.y, size.width, size.height); + if (_isVertical && flipped) + _floatValue = _maxValue + _minValue - _floatValue; + + floatValue = (_floatValue - _minValue) / (_maxValue - _minValue); + + size = [image size]; + + if (_isVertical) + { + origin.x = 2; + origin.y = ((_trackRect.size.height - size.height) * floatValue) + 2; + } + else + { + origin.x = ((_trackRect.size.width - size.width) * floatValue) + 2; + origin.y = 2; + } + + return NSMakeRect (origin.x, origin.y, size.width, size.height); } - (void)drawKnob