From 1457f5d1c89bd293c34f55bdc19e385936742fab Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Tue, 28 Oct 2008 01:07:03 -0700 Subject: [PATCH] Changed deprecated setValues/value to setFloatValue/floatValue. --- AppKit/CPColorPanel.j | 17 +++++----- AppKit/CPColorPicker.j | 16 +++++----- AppKit/CPSliderColorPicker.j | 60 ++++++++++++++++++------------------ 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/AppKit/CPColorPanel.j b/AppKit/CPColorPanel.j index 0bf26d314..2656791c8 100644 --- a/AppKit/CPColorPanel.j +++ b/AppKit/CPColorPanel.j @@ -137,7 +137,7 @@ CPColorPickerViewHeight = 370; [CPApp sendAction:@selector(changeColor:) to:nil from:self]; if (_target && _action) - objj_msgSend(_target, _action, self); + [CPApp sendAction:_action to:_target from:self]; [[CPNotificationCenter defaultCenter] postNotificationName:CPColorPanelColorDidChangeNotification @@ -149,14 +149,13 @@ CPColorPickerViewHeight = 370; @param bool whether or not to update the picker @ignore */ - -(void)setColor:(CPColor)aColor updatePicker:(BOOL)bool - { - [self setColor: aColor]; - - if(bool) - [_activePicker setColor: _color]; - } - +- (void)setColor:(CPColor)aColor updatePicker:(BOOL)bool +{ + [self setColor:aColor]; + + if (bool) + [_activePicker setColor:_color]; +} /*! Returns the panel's currently selected color. diff --git a/AppKit/CPColorPicker.j b/AppKit/CPColorPicker.j index 544d93661..6770c8d1c 100644 --- a/AppKit/CPColorPicker.j +++ b/AppKit/CPColorPicker.j @@ -126,9 +126,9 @@ brightnessBarView._DOMElement.appendChild(_brightnessBarImage); _brightnessSlider = [[CPSlider alloc] initWithFrame: CPRectMake(0, aFrame.size.height - 22, aFrame.size.width, 12)]; - [_brightnessSlider setMaxValue: 100.0]; - [_brightnessSlider setMinValue: 0.0]; - [_brightnessSlider setValue: 100.0]; + [_brightnessSlider setMaxValue: 100.0]; + [_brightnessSlider setMinValue: 0.0]; + [_brightnessSlider setFloatValue:100.0]; [_brightnessSlider setTarget: self]; [_brightnessSlider setAction: @selector(brightnessSliderDidChange:)]; @@ -157,7 +157,7 @@ { var hue = [_hueSaturationView angle], saturation = [_hueSaturationView distance], - brightness = [_brightnessSlider value]; + brightness = [_brightnessSlider floatValue]; [_hueSaturationView setWheelBrightness: brightness / 100.0]; _brightnessBarImage.style.backgroundColor = "#"+[[CPColor colorWithHue: hue saturation: saturation brightness: 100] hexString]; @@ -187,11 +187,11 @@ { var hsb = [newColor hsbComponents]; - [_hueSaturationView setPositionToColor: newColor]; - [_brightnessSlider setValue: hsb[2]]; - [_hueSaturationView setWheelBrightness: hsb[2] / 100.0]; + [_hueSaturationView setPositionToColor:newColor]; + [_brightnessSlider setFloatValue:hsb[2]]; + [_hueSaturationView setWheelBrightness:hsb[2] / 100.0]; - _brightnessBarImage.style.backgroundColor = "#"+[[CPColor colorWithHue: hsb[0] saturation: hsb[1] brightness: 100] hexString]; + _brightnessBarImage.style.backgroundColor = "#"+[[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:100] hexString]; } @end diff --git a/AppKit/CPSliderColorPicker.j b/AppKit/CPSliderColorPicker.j index 2d5fc5cea..7dedd0296 100644 --- a/AppKit/CPSliderColorPicker.j +++ b/AppKit/CPSliderColorPicker.j @@ -93,28 +93,28 @@ switch(this) { - case _redValue: [_redSlider setValue: MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; - [self sliderChanged: _redSlider]; + case _redValue: [_redSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; + //[self sliderChanged: _redSlider]; break; - case _greenValue: [_greenSlider setValue: MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; - [self sliderChanged: _greenSlider]; + case _greenValue: [_greenSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; + //[self sliderChanged: _greenSlider]; break; - case _blueValue: [_blueSlider setValue: MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; - [self sliderChanged: _blueSlider]; + case _blueValue: [_blueSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; + //[self sliderChanged: _blueSlider]; break; - case _hueValue: [_hueSlider setValue: MAX(MIN(ROUND(this.value), 360), 0)]; - [self sliderChanged: _hueSlider]; + case _hueValue: [_hueSlider setFloatValue:MAX(MIN(ROUND(this.value), 360), 0)]; + //[self sliderChanged: _hueSlider]; break; - case _saturationValue: [_saturationSlider setValue: MAX(MIN(ROUND(this.value), 100), 0)]; - [self sliderChanged: _saturationSlider]; + case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(this.value), 100), 0)]; + //[self sliderChanged: _saturationSlider]; break; - case _brightnessValue: [_brightnessSlider setValue: MAX(MIN(ROUND(this.value), 100), 0)]; - [self sliderChanged: _brightnessSlider]; + case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(this.value), 100), 0)]; + //[self sliderChanged: _brightnessSlider]; break; } @@ -339,18 +339,18 @@ { case _hueSlider: case _saturationSlider: - case _brightnessSlider: newColor = [CPColor colorWithHue: [_hueSlider value] - saturation: [_saturationSlider value] - brightness: [_brightnessSlider value]]; + case _brightnessSlider: newColor = [CPColor colorWithHue: [_hueSlider floatValue] + saturation: [_saturationSlider floatValue] + brightness: [_brightnessSlider floatValue]]; [self updateRGBSliders: newColor]; break; case _redSlider: case _greenSlider: - case _blueSlider: newColor = [CPColor colorWithCalibratedRed: [_redSlider value] - green: [_greenSlider value] - blue: [_blueSlider value] + case _blueSlider: newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue] + green: [_greenSlider floatValue] + blue: [_blueSlider floatValue] alpha: 1.0]; [self updateHSBSliders: newColor]; @@ -374,9 +374,9 @@ { var hsb = [aColor hsbComponents]; - [_hueSlider setValue: hsb[0]]; - [_saturationSlider setValue: hsb[1]]; - [_brightnessSlider setValue: hsb[2]]; + [_hueSlider setFloatValue:hsb[0]]; + [_saturationSlider setFloatValue:hsb[1]]; + [_brightnessSlider setFloatValue:hsb[2]]; } - (void)updateHex:(CPColor)aColor @@ -388,20 +388,20 @@ { var rgb = [aColor components]; - [_redSlider setValue: rgb[0]]; - [_greenSlider setValue: rgb[1]]; - [_blueSlider setValue: rgb[2]]; + [_redSlider setFloatValue:rgb[0]]; + [_greenSlider setFloatValue:rgb[1]]; + [_blueSlider setFloatValue:rgb[2]]; } - (void)updateLabels { - _hueValue.value = ROUND([_hueSlider value]); - _saturationValue.value = ROUND([_saturationSlider value]); - _brightnessValue.value = ROUND([_brightnessSlider value]); + _hueValue.value = ROUND([_hueSlider floatValue]); + _saturationValue.value = ROUND([_saturationSlider floatValue]); + _brightnessValue.value = ROUND([_brightnessSlider floatValue]); - _redValue.value = ROUND([_redSlider value] * 255); - _greenValue.value = ROUND([_greenSlider value] * 255); - _blueValue.value = ROUND([_blueSlider value] * 255); + _redValue.value = ROUND([_redSlider floatValue] * 255); + _greenValue.value = ROUND([_greenSlider floatValue] * 255); + _blueValue.value = ROUND([_blueSlider floatValue] * 255); }