suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS X: map the backspace key to the "Delete" function.

Browse Source 
Apple hardware does not have a discrete Delete key, so Backspace
is used for deleting stuff instead.
This commit is contained in:
whitequark 2016-10-12 23:42:41 +04:00
parent 90f10ccfa6
commit 5462fc6b3c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/platform/cocoamain.mm
View File

@ -353,8 +353,6 @@ CONVERT(Rect)
if(NSString *nsChr = [event charactersIgnoringModifiers]) if(NSString *nsChr = [event charactersIgnoringModifiers])
chr = [nsChr characterAtIndex:0]; chr = [nsChr characterAtIndex:0];
if(chr == NSDeleteCharacter) /* map delete back to backspace */
chr = '\b';
if(chr >= NSF1FunctionKey && chr <= NSF12FunctionKey) if(chr >= NSF1FunctionKey && chr <= NSF12FunctionKey)
chr = SolveSpace::GraphicsWindow::FUNCTION_KEY_BASE + (chr - NSF1FunctionKey); chr = SolveSpace::GraphicsWindow::FUNCTION_KEY_BASE + (chr - NSF1FunctionKey);
@ -632,12 +630,15 @@ void InitMainMenu(NSMenu *mainMenu) {
label = [[NSString stringWithUTF8String:entry->label] label = [[NSString stringWithUTF8String:entry->label]
stringByReplacingOccurrencesOfString:@"&" withString:@""]; stringByReplacingOccurrencesOfString:@"&" withString:@""];
unichar accel_char = entry->accel & unichar accelChar = entry->accel &
~(GraphicsWindow::SHIFT_MASK | GraphicsWindow::CTRL_MASK); ~(GraphicsWindow::SHIFT_MASK | GraphicsWindow::CTRL_MASK);
if(accel_char > GraphicsWindow::FUNCTION_KEY_BASE && if(accelChar > GraphicsWindow::FUNCTION_KEY_BASE &&
accel_char <= GraphicsWindow::FUNCTION_KEY_BASE + 12) accelChar <= GraphicsWindow::FUNCTION_KEY_BASE + 12) {
accel_char = NSF1FunctionKey + (accel_char - GraphicsWindow::FUNCTION_KEY_BASE - 1); accelChar = NSF1FunctionKey + (accelChar - GraphicsWindow::FUNCTION_KEY_BASE - 1);
NSString *accel = [NSString stringWithCharacters:&accel_char length:1]; } else if(accelChar == GraphicsWindow::DELETE_KEY) {
accelChar = NSBackspaceCharacter;
}
NSString *accel = [NSString stringWithCharacters:&accelChar length:1];
menuItem = [levels[entry->level] addItemWithTitle:label menuItem = [levels[entry->level] addItemWithTitle:label
action:NULL keyEquivalent:[accel lowercaseString]]; action:NULL keyEquivalent:[accel lowercaseString]];