From 108d60a4972c38fbd8fc3d642982f0e25b0221a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Kiss?= Date: Mon, 12 Nov 2018 23:22:26 +0100 Subject: [PATCH] feat: show os specific modifiers for macro actions (#855) --- .../src/app/components/macro/item/macro-item.component.ts | 2 +- packages/uhk-web/src/app/services/mapper.service.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/uhk-web/src/app/components/macro/item/macro-item.component.ts b/packages/uhk-web/src/app/components/macro/item/macro-item.component.ts index 6a7675c7..158b4184 100644 --- a/packages/uhk-web/src/app/components/macro/item/macro-item.component.ts +++ b/packages/uhk-web/src/app/components/macro/item/macro-item.component.ts @@ -155,7 +155,7 @@ export class MacroItemComponent implements OnInit, OnChanges { // Tap/press/release modifiers for (let i = KeyModifiers.leftCtrl; i <= KeyModifiers.rightGui; i <<= 1) { if (action.isModifierActive(i)) { - this.title += ' ' + KeyModifiers[i]; + this.title += ' ' + this.mapper.getOsSpecificModifierTextByValue(i); } } } diff --git a/packages/uhk-web/src/app/services/mapper.service.ts b/packages/uhk-web/src/app/services/mapper.service.ts index 8583ab4d..78e3ac02 100644 --- a/packages/uhk-web/src/app/services/mapper.service.ts +++ b/packages/uhk-web/src/app/services/mapper.service.ts @@ -175,6 +175,13 @@ export class MapperService { ]; } + public getOsSpecificModifierTextByValue(value: KeyModifiers): string { + const keyModifier = [...this.getLeftKeyModifiers(), ...this.getRightKeyModifiers()] + .find(modifier => modifier.value === value); + + return (keyModifier || {text: ''}).text; + } + private initOsSpecificText(): void { this.osSpecificTexts = new Map();