uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(renderer): show icon when possible even if the keystroke action has modifier (#533)

Browse Source 
Closes #513
This commit is contained in:
József Farkas
2017-12-26 23:23:32 +01:00
committed by László Monda
parent 721a4dc6e7
commit 5ceca41e0f
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/uhk-web/src/app/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.html
View File

@@ -1,5 +1,10 @@
<svg [attr.viewBox]="viewBox" [attr.width]="textContainer.width" [attr.height]="textContainer.height"
[attr.x]="textContainer.x" [attr.y]="textContainer.y" [ngSwitch]="labelType">
<svg:g svg-single-icon-key *ngSwitchCase="'icon'"
[height]="height"
[width]="width"
[icon]="labelSource">
</svg:g>
<svg:g svg-one-line-text-key *ngSwitchCase="'one-line'"
[height]="height"
[width]="width"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

26
packages/uhk-web/src/app/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
View File

@@ -127,21 +127,23 @@ export class SvgKeystrokeKeyComponent implements OnInit, OnChanges {
}
ngOnChanges() {
let newLabelSource: string[];
if (this.keystrokeAction.hasScancode()) {
const scancode: number = this.keystrokeAction.scancode;
newLabelSource = this.mapper.scanCodeToText(scancode, this.keystrokeAction.type);
if (newLabelSource) {
if (newLabelSource.length === 1) {
this.labelSource = newLabelSource[0];
this.labelType = 'one-line';
} else {
this.labelSource = newLabelSource;
this.labelType = 'two-line';
}
} else {
this.labelSource = this.mapper.scanCodeToSvgImagePath(scancode, this.keystrokeAction.type);
this.labelSource = this.mapper.scanCodeToSvgImagePath(scancode, this.keystrokeAction.type);
if (this.labelSource) {
this.labelType = 'icon';
} else {
let newLabelSource: string[];
newLabelSource = this.mapper.scanCodeToText(scancode, this.keystrokeAction.type);
if (newLabelSource) {
if (newLabelSource.length === 1) {
this.labelSource = newLabelSource[0];
this.labelType = 'one-line';
} else {
this.labelSource = newLabelSource;
this.labelType = 'two-line';
}
}
}
} else {
this.labelType = 'empty';

6
packages/uhk-web/src/app/services/mapper.service.ts
View File

@@ -71,7 +71,11 @@ export class MapperService {
default:
return undefined;
}
return 'assets/compiled_sprite.svg#' + map.get(scanCode);
const id = map.get(scanCode);
if (!id) {
return undefined;
}
return `assets/compiled_sprite.svg#${id}`;
}
public getIcon(iconName: string): string {