From 224b21b6aa432864a1db46e24d662becdba76f14 Mon Sep 17 00:00:00 2001 From: Abhishek Banthia Date: Thu, 4 May 2017 21:07:37 -0400 Subject: [PATCH] Future Slider Reset Bug. --- Clocker/CLParentPanelController.h | 2 ++ Clocker/CLParentPanelController.m | 2 -- Clocker/Floating Window/CLFloatingWindowController.m | 1 + Clocker/PanelController.m | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Clocker/CLParentPanelController.h b/Clocker/CLParentPanelController.h index 5e58f4d..4919d31 100644 --- a/Clocker/CLParentPanelController.h +++ b/Clocker/CLParentPanelController.h @@ -9,6 +9,7 @@ #import #import "CLOneWindowController.h" #import "CLAppFeedbackWindowController.h" +#import "CLTableViewDataSource.h" @interface CLParentPanelController : NSWindowController @@ -27,6 +28,7 @@ @property (weak) IBOutlet NSTableView *mainTableview; @property (weak) IBOutlet NSLayoutConstraint *scrollViewHeight; @property (nonatomic, strong) CLOneWindowController *oneWindow; +@property (strong) CLTableViewDataSource *timezoneDataSource; @property (weak, nonatomic) IBOutlet NSImageView *imageView; @property (weak, nonatomic) IBOutlet NSTextField *leftField; diff --git a/Clocker/CLParentPanelController.m b/Clocker/CLParentPanelController.m index e3b3ce9..66d35f3 100644 --- a/Clocker/CLParentPanelController.m +++ b/Clocker/CLParentPanelController.m @@ -12,7 +12,6 @@ #import "CLOneWindowController.h" #import #import "iRate.h" -#import "CLTableViewDataSource.h" #import #import "ApplicationDelegate.h" #import @@ -29,7 +28,6 @@ typedef NS_ENUM(NSUInteger, CLClockerMode) { }; @interface CLParentPanelController () -@property (strong) CLTableViewDataSource *timezoneDataSource; @end @implementation CLParentPanelController diff --git a/Clocker/Floating Window/CLFloatingWindowController.m b/Clocker/Floating Window/CLFloatingWindowController.m index ee8159c..fadaede 100644 --- a/Clocker/Floating Window/CLFloatingWindowController.m +++ b/Clocker/Floating Window/CLFloatingWindowController.m @@ -130,6 +130,7 @@ NSString *const CLTimezoneCellIdentifier = @"timeZoneCell"; -(void)windowWillClose:(NSNotification *)notification { self.futureSliderValue = 0; + self.timezoneDataSource.futureSliderValue = 0; if (self.floatingWindowTimer) { diff --git a/Clocker/PanelController.m b/Clocker/PanelController.m index 24ac20c..5664e01 100755 --- a/Clocker/PanelController.m +++ b/Clocker/PanelController.m @@ -205,6 +205,8 @@ static PanelController *sharedPanel = nil; - (void)openPanel { + [Answers logCustomEventWithName:@"openedPanel" customAttributes:@{}]; + NSPoint mouseLoc = [NSEvent mouseLocation]; NSEnumerator *screenEnum = [[NSScreen screens] objectEnumerator]; NSScreen *screen; @@ -212,6 +214,7 @@ static PanelController *sharedPanel = nil; [screen frame], NO)); self.futureSliderValue = 0; + self.timezoneDataSource.futureSliderValue = 0; self.reviewView.hidden = !self.showReviewCell;