drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Added paning of the map and search keyboard shortcut for Macs

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-08-04 18:23:00 +02:00
committed by Konstantin Pastbin
parent f05a9c9eb4
commit 722fc5e333
1 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
iphone/Maps/Classes/MapViewController.mm
View File

@@ -468,12 +468,20 @@ NSString *const kAboutSegue = @"Map2About";
- (void)setupTrackPadGestureRecognizers API_AVAILABLE(ios(14.0)) { - (void)setupTrackPadGestureRecognizers API_AVAILABLE(ios(14.0)) {
if (!NSProcessInfo.processInfo.isiOSAppOnMac) if (!NSProcessInfo.processInfo.isiOSAppOnMac)
return; return;
// Mouse zoom // Pan
UIPanGestureRecognizer * panRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)]; UIPanGestureRecognizer * panRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)];
panRecognizer.allowedScrollTypesMask = UIScrollTypeMaskAll; panRecognizer.minimumNumberOfTouches = 2;
panRecognizer.allowedScrollTypesMask = UIScrollTypeMaskContinuous;
panRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirect)]; panRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirect)];
panRecognizer.delegate = self;
[self.view addGestureRecognizer:panRecognizer]; [self.view addGestureRecognizer:panRecognizer];
// Mouse zoom
UIPanGestureRecognizer * zoomPanRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleZoomPan:)];
zoomPanRecognizer.allowedScrollTypesMask = UIScrollTypeMaskDiscrete;
zoomPanRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirect)];
[self.view addGestureRecognizer:zoomPanRecognizer];
// Trackpad zoom // Trackpad zoom
UIPinchGestureRecognizer * pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handlePinch:)]; UIPinchGestureRecognizer * pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handlePinch:)];
pinchRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirect)]; pinchRecognizer.allowedTouchTypes = @[@(UITouchTypeIndirect)];
@@ -810,7 +818,8 @@ NSString *const kAboutSegue = @"Map2About";
[UIKeyCommand commandWithTitle:@"Zoom Out" image:[UIImage systemImageNamed: @"minus.magnifyingglass"] action:@selector(zoomOut) input:@"-" modifierFlags:UIKeyModifierCommand propertyList:nil], [UIKeyCommand commandWithTitle:@"Zoom Out" image:[UIImage systemImageNamed: @"minus.magnifyingglass"] action:@selector(zoomOut) input:@"-" modifierFlags:UIKeyModifierCommand propertyList:nil],
[UIKeyCommand commandWithTitle:@"Zoom In" image:[UIImage systemImageNamed: @"plus.magnifyingglass"] action:@selector(zoomIn) input:@"+" modifierFlags:UIKeyModifierCommand propertyList:nil], [UIKeyCommand commandWithTitle:@"Zoom In" image:[UIImage systemImageNamed: @"plus.magnifyingglass"] action:@selector(zoomIn) input:@"+" modifierFlags:UIKeyModifierCommand propertyList:nil],
[UIKeyCommand commandWithTitle:@"Go Back" image:nil action:@selector(goBack) input:UIKeyInputEscape modifierFlags:0 propertyList:nil], [UIKeyCommand commandWithTitle:@"Go Back" image:nil action:@selector(goBack) input:UIKeyInputEscape modifierFlags:0 propertyList:nil],
[UIKeyCommand commandWithTitle:@"Switch position mode" image:nil action:@selector(switchPositionMode) input:@"0" modifierFlags:UIKeyModifierCommand propertyList:nil] [UIKeyCommand commandWithTitle:@"Switch position mode" image:nil action:@selector(switchPositionMode) input:@"0" modifierFlags:UIKeyModifierCommand propertyList:nil],
[UIKeyCommand commandWithTitle:@"Search" image:[UIImage systemImageNamed: @"magnifyingglass"] action:@selector(search) input:@"F" modifierFlags:UIKeyModifierCommand propertyList:nil]
]; ];
for (UIKeyCommand *command in commands) { for (UIKeyCommand *command in commands) {
@@ -820,6 +829,12 @@ NSString *const kAboutSegue = @"Map2About";
return commands; return commands;
} }
- (void)search {
if (!self.searchManager.isSearching) {
[self.searchManager startSearchingWithIsRouting:NO];
}
}
- (void)zoomOut { - (void)zoomOut {
GetFramework().Scale(Framework::SCALE_MIN, true); GetFramework().Scale(Framework::SCALE_MIN, true);
} }
@@ -886,6 +901,38 @@ NSString *const kAboutSegue = @"Map2About";
// MARK: - Handle macOS trackpad gestures // MARK: - Handle macOS trackpad gestures
- (void)handlePan:(UIPanGestureRecognizer *)recognizer API_AVAILABLE(ios(14.0)) { - (void)handlePan:(UIPanGestureRecognizer *)recognizer API_AVAILABLE(ios(14.0)) {
switch (recognizer.state) {
case UIGestureRecognizerStateBegan:
case UIGestureRecognizerStateChanged:
{
CGPoint translation = [recognizer translationInView:self.view];
if (translation.x == 0 && translation.y == 0 && CGPointEqualToPoint(translation, CGPointZero))
return;
self.userTouchesAction = UserTouchesActionDrag;
CGPoint velocity = [recognizer velocityInView:self.view];
CGFloat velocityX = ABS(velocity.x * 0.001);
velocityX = MAX(1, velocityX);
if (velocityX > 2.5) {
velocityX = 2.5;
}
CGFloat velocityY = ABS(velocity.y * 0.001);
velocityY = MAX(1, velocityY);
if (velocityY > 2.5) {
velocityY = 2.5;
}
GetFramework().Scroll((translation.x * velocityX) * -1, (translation.y * velocityY) * -1);
[recognizer setTranslation:CGPointZero inView:self.view];
break;
}
case UIGestureRecognizerStateEnded:
self.userTouchesAction = UserTouchesActionNone;
break;
default:
break;
}
}
- (void)handleZoomPan:(UIPanGestureRecognizer *)recognizer API_AVAILABLE(ios(14.0)) {
switch (recognizer.state) { switch (recognizer.state) {
case UIGestureRecognizerStateBegan: case UIGestureRecognizerStateBegan:
case UIGestureRecognizerStateChanged: case UIGestureRecognizerStateChanged: