nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-23 09:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Selection inside edit fields are now respected when copying

Browse Source
This commit is contained in:
Michael Starke
2019-02-14 18:04:14 +01:00
parent 51c486fb82
commit ef7a3085fd
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MacPass/MPEntryInspectorViewController.m
View File

@@ -594,9 +594,12 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
- (BOOL)textField:(NSTextField *)textField textView:(NSTextView *)textView performAction:(SEL)action {
if(action == @selector(copy:)) {
MPPasteboardOverlayInfoType info = MPPasteboardOverlayInfoCustom;
NSString *value = textField.stringValue;
NSMutableString *selectedValue = [[NSMutableString alloc] init];
for(NSValue *rangeValue in textView.selectedRanges) {
[selectedValue appendString:[textView.string substringWithRange:rangeValue.rangeValue]];
}
NSString *name = @"";
if(nil == value) {
if(selectedValue.length == 0) {
return YES;
}
if(textField == self.usernameTextField) {
@@ -620,7 +623,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
name = [_customFieldsController.arrangedObjects[index] key];
}
}
[MPPasteBoardController.defaultController copyObjects:@[value] overlayInfo:info name:name atView:self.view];
[MPPasteBoardController.defaultController copyObjects:@[selectedValue] overlayInfo:info name:name atView:self.view];
return NO;
}
return YES;