Browse Source

Readability.

v1.2.4
Abhishek Banthia 9 years ago
parent
commit
69898ec74e
  1. 31
      Clocker/CLParentPanelController.m

31
Clocker/CLParentPanelController.m

@ -55,14 +55,12 @@
self.scrollViewHeight.constant = self.showReviewCell ? self.scrollViewHeight.constant = self.showReviewCell ?
(self.defaultPreferences.count+1)*55+40 : self.defaultPreferences.count*55 + 30; (self.defaultPreferences.count+1)*55+40 : self.defaultPreferences.count*55 + 30;
if (self.defaultPreferences.count == 1) { NSNumber *displayFutureSlider = [[NSUserDefaults standardUserDefaults] objectForKey:CLDisplayFutureSliderKey];
self.futureSlider.hidden = YES;
} /*No Future Slider when no timezones duh*/
else
{ self.futureSlider.hidden = [displayFutureSlider isEqualToNumber:[NSNumber numberWithInteger:1]] || (self.defaultPreferences.count == 0) ? YES : NO;
self.futureSlider.hidden = NO;
}
[self updatePanelColor]; [self updatePanelColor];
} }
@ -172,18 +170,13 @@
[self performBoundsAnimationWithOldRect:oldFrame andNewRect:originalFrame]; [self performBoundsAnimationWithOldRect:oldFrame andNewRect:originalFrame andShouldOpenTimezonePanel:value];
if (value)
{
[self.oneWindow.preferencesView addTimeZone:self];
}
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
} }
- (void)performBoundsAnimationWithOldRect:(CGRect)fromRect andNewRect:(CGRect)newRect - (void)performBoundsAnimationWithOldRect:(CGRect)fromRect andNewRect:(CGRect)newRect andShouldOpenTimezonePanel:(BOOL)shouldOpen
{ {
[self.oneWindow.window setFrame:fromRect display:NO animate:NO]; [self.oneWindow.window setFrame:fromRect display:NO animate:NO];
@ -192,6 +185,14 @@
anim.toValue = [NSValue valueWithCGRect:newRect]; anim.toValue = [NSValue valueWithCGRect:newRect];
anim.springSpeed = 1; anim.springSpeed = 1;
[self.oneWindow.window pop_addAnimation:anim forKey:@"popBounds"]; [self.oneWindow.window pop_addAnimation:anim forKey:@"popBounds"];
anim.completionBlock = ^(POPAnimation *animation, BOOL finished)
{
if (finished && shouldOpen)
{
[self.oneWindow.preferencesView addTimeZone:self];
}
};
} }

Loading…
Cancel
Save