Skip to content

Make selection be based on touch up instead of touch down, so user can tap, and drag a little to cancel the touch. Makes scroll much easier to trigger #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hboon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make selection be based on touch up instead of touch down, so user can tap, and drag a little to cancel the touch. Makes scroll much easier to trigger #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea595e0
* Make selection be based on touch up instead of touch down, so user can
hboon Apr 1, 2014
95c0b38
Fix: more consistent method names and remove unnecessary casts.
hboon Apr 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions TimesSquare/TSQCalendarRowCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ - (void)createDayButtons;
NSMutableArray *dayButtons = [NSMutableArray arrayWithCapacity:self.daysInWeek];
for (NSUInteger index = 0; index < self.daysInWeek; index++) {
UIButton *button = [[UIButton alloc] initWithFrame:self.contentView.bounds];
[button addTarget:self action:@selector(dateButtonPressed:) forControlEvents:UIControlEventTouchDown];
[button addTarget:self action:@selector(dateButtonTouchDown:) forControlEvents:UIControlEventTouchDown];
[button addTarget:self action:@selector(dateButtonTouchDragExit:) forControlEvents:UIControlEventTouchDragExit];
[button addTarget:self action:@selector(dateButtonTouchCancel:) forControlEvents:UIControlEventTouchCancel];
[button addTarget:self action:@selector(dateButtonTouchUpInside:) forControlEvents:UIControlEventTouchUpInside];
[dayButtons addObject:button];
[self.contentView addSubview:button];
[self configureButton:button];
Expand Down Expand Up @@ -181,14 +184,41 @@ - (void)setBottomRow:(BOOL)bottomRow;
[self setNeedsLayout];
}

- (IBAction)dateButtonPressed:(id)sender;
- (void)resetDateButtonDisplay:(UIButton*)aButton;
{
aButton.backgroundColor = nil;
[aButton setTitleColor:self.textColor forState:UIControlStateNormal];
}

- (void)markDateButtonSelected:(UIButton*)aButton;
{
aButton.backgroundColor = [UIColor darkGrayColor];
[aButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
}

- (IBAction)dateButtonTouchUpInside:(id)sender;
{
NSDateComponents *offset = [NSDateComponents new];
offset.day = [self.dayButtons indexOfObject:sender];
NSDate *selectedDate = [self.calendar dateByAddingComponents:offset toDate:self.beginningDate options:0];
self.calendarView.selectedDate = selectedDate;
}

- (IBAction)dateButtonTouchDown:(id)sender;
{
[self markDateButtonSelected:sender];
}

- (IBAction)dateButtonTouchDragExit:(id)sender;
{
[self resetDateButtonDisplay:sender];
}

- (IBAction)dateButtonTouchCancel:(id)sender;
{
[self resetDateButtonDisplay:sender];
}

- (IBAction)todayButtonPressed:(id)sender;
{
NSDateComponents *offset = [NSDateComponents new];
Expand Down