From 662ca0152f263c928468170fdb718a122cc2c1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Kiss?= Date: Mon, 29 Jan 2018 23:40:41 +0100 Subject: [PATCH] fix(keymap): Don't show keymap description in the key action popover (#572) --- .../components/keyboard/slider/keyboard-slider.component.html | 1 + .../app/components/svg/keyboard/svg-keyboard.component.html | 3 ++- .../src/app/components/svg/keyboard/svg-keyboard.component.ts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/uhk-web/src/app/components/keyboard/slider/keyboard-slider.component.html b/packages/uhk-web/src/app/components/keyboard/slider/keyboard-slider.component.html index 87b2279a..544e08b3 100644 --- a/packages/uhk-web/src/app/components/keyboard/slider/keyboard-slider.component.html +++ b/packages/uhk-web/src/app/components/keyboard/slider/keyboard-slider.component.html @@ -8,6 +8,7 @@ [selected]="selectedKey?.layerId === index" [keyboardLayout]="keyboardLayout" [description]="description" + [showDescription]="true" (keyClick)="keyClick.emit($event)" (keyHover)="keyHover.emit($event)" (capture)="capture.emit($event)" diff --git a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html index ffd3c0bf..5a622a91 100644 --- a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html +++ b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html @@ -14,6 +14,7 @@ (capture)="onCapture(i, $event.index, $event.captured)" /> - diff --git a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.ts b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.ts index f74e0dd2..884b7deb 100644 --- a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.ts +++ b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.ts @@ -32,6 +32,7 @@ export class SvgKeyboardComponent implements OnInit { @Input() halvesSplit: boolean; @Input() keyboardLayout = KeyboardLayout.ANSI; @Input() description: string; + @Input() showDescription = false; @Output() keyClick = new EventEmitter(); @Output() keyHover = new EventEmitter(); @Output() capture = new EventEmitter();