github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-20 04:08:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Escape can now be used to clear a recorded key equivalent

Browse Source 
If there is no recorded key equivalent then the key is passed to super.
This commit is contained in:
Allan Odgaard
2014-09-02 20:43:20 +02:00
parent 74e9448738
commit 751a564fe2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/OakAppKit/src/OakKeyEquivalentView.mm
View File

@@ -226,10 +226,10 @@ static NSString* const kRecordingPlaceholderString = @"…";
- (void)keyDown:(NSEvent*)anEvent
{
static std::set<std::string> const ClearKeys = { utf8::to_s(NSDeleteCharacter), utf8::to_s(NSDeleteFunctionKey) };
static std::set<std::string> const ClearKeys = { utf8::to_s(NSDeleteCharacter), utf8::to_s(NSDeleteFunctionKey), "\e" };
static std::set<std::string> const RecordingKeys = { " " };
std::string const keyString = to_s(anEvent);
if(ClearKeys.find(keyString) != ClearKeys.end())
if(ClearKeys.find(keyString) != ClearKeys.end() && !OakIsEmptyString(self.eventString))
[self clearKeyEquivalent:self];
else if(RecordingKeys.find(keyString) != RecordingKeys.end())
self.recording = YES;