From 4aaafa6de713c99a0185ec5edf62bc80d475e84e Mon Sep 17 00:00:00 2001 From: Christophe Serafin Date: Thu, 7 Aug 2014 16:50:23 -0700 Subject: [PATCH] fix CPDatePicker alignment in CPPredicateEditor. fixes #2162 --- AppKit/CPDatePicker/CPDatePicker.j | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/AppKit/CPDatePicker/CPDatePicker.j b/AppKit/CPDatePicker/CPDatePicker.j index b6fe90963..691b0b8f0 100644 --- a/AppKit/CPDatePicker/CPDatePicker.j +++ b/AppKit/CPDatePicker/CPDatePicker.j @@ -287,11 +287,17 @@ CPEraDatePickerElementFlag = 0x0100; return _dateValue } -/*! Set the objectValue ofhe datePier. It has to be a CPDate +/*! Set the objectValue of the datePicker. It has to be a CPDate @param aDateValue the dateValue */ -- (void)setObjectValue:(CPDate)aValue +- (void)setObjectValue:(id)aValue { + if ([aValue isKindOfClass:CPString]) + { + var dateFormatter = [[CPDateFormatter alloc] init]; + aValue = [dateFormatter dateFromString:aValue]; + } + [self setDateValue:aValue]; } @@ -350,7 +356,8 @@ CPEraDatePickerElementFlag = 0x0100; _timeInterval = (_datePickerMode == CPSingleDateMode)? 0 : aTimeInterval; [self didChangeValueForKey:@"timeInterval"]; - [self sendAction:[self action] to:[self target]]; + if ([self action] && [self target]) + [self sendAction:[self action] to:[self target]]; if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle) [_datePickerTextfield setDateValue:_dateValue]; @@ -549,6 +556,7 @@ CPEraDatePickerElementFlag = 0x0100; return NO; [_datePickerTextfield _selectTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]]; + return YES; }