X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputController.m;h=07c077b4048294c783a48bde8086dc938e639cbd;hp=6ae58d4dc3b2ab289e0bf936d677a67c08f1d895;hb=58ce8f7f50f382f18e7b416eca737803af284868;hpb=8a7999648d97e3040d2ac820b612265f8a07c92f diff --git a/Classes/NJOutputController.m b/Classes/NJOutputController.m index 6ae58d4..07c077b 100644 --- a/Classes/NJOutputController.m +++ b/Classes/NJOutputController.m @@ -166,7 +166,7 @@ case 1: if (keyInput.hasKeyCode) { NJOutputKeyPress *k = [[NJOutputKeyPress alloc] init]; - k.vk = keyInput.keyCode; + k.keyCode = keyInput.keyCode; return k; } else { return nil; @@ -229,7 +229,7 @@ } else { self.enabled = YES; NSString *inpFullName = input.name; - for (id cur = input.base; cur; cur = cur.base) { + for (NJInputPathElement *cur = input.parent; cur; cur = cur.parent) { inpFullName = [[NSString alloc] initWithFormat:@"%@ ▸ %@", cur.name, inpFullName]; } title.stringValue = inpFullName; @@ -237,7 +237,7 @@ if ([output isKindOfClass:NJOutputKeyPress.class]) { [radioButtons selectCellAtRow:1 column:0]; - keyInput.keyCode = [(NJOutputKeyPress*)output vk]; + keyInput.keyCode = [(NJOutputKeyPress*)output keyCode]; } else if ([output isKindOfClass:NJOutputMapping.class]) { [radioButtons selectCellAtRow:2 column:0]; NSMenuItem *item = [mappingPopup itemWithRepresentedObject:[(NJOutputMapping *)output mapping]];