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

Merge remote-tracking branch 'upstream/master' into feature/keymap_keymaps

Browse Source
This commit is contained in:
Sam Rang
2016-04-17 21:01:08 -05:00
parent ec0dcdae2d 9bbd5f39b1
commit 3c18e7cf86
20 changed files with 244 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config-serializer/config-items/KeystrokeModifiersAction.ts
View File

@@ -41,4 +41,8 @@ class KeystrokeModifiersAction extends KeyAction {
toString(): string {
return `<KeystrokeModifiersAction modifierMask="${this.modifierMask}">`;
}
isModifierActive(modifier: KeyModifiers): boolean {
return (this.modifierMask & modifier) > 0;
}
}

4
config-serializer/config-items/KeystrokeWithModifiersAction.ts
View File

@@ -37,4 +37,8 @@ class KeystrokeWithModifiersAction extends KeyAction {
toString(): string {
return `<KeystrokeWithModifiersAction scancode="${this.scancode}" modifierMask="${this.modifierMask}">`;
}
isModifierActive(modifier: KeyModifiers): boolean {
return (this.modifierMask & modifier) > 0;
}
}

10
config-serializer/config-items/SwitchLayerAction.ts
View File

@@ -1,4 +1,4 @@
enum KeyLayer {
enum LayerName {
mod,
fn,
mouse
@@ -10,12 +10,12 @@ class SwitchLayerAction extends KeyAction {
isLayerToggleable: boolean;
// @assertEnum(KeyLayer)
private layer: KeyLayer;
// @assertEnum(LayerName)
private layer: LayerName;
_fromJsObject(jsObject: any): SwitchLayerAction {
this.assertKeyActionType(jsObject);
this.layer = KeyLayer[<string> jsObject.layer];
this.layer = LayerName[<string> jsObject.layer];
this.isLayerToggleable = jsObject.toggle;
return this;
}
@@ -31,7 +31,7 @@ class SwitchLayerAction extends KeyAction {
_toJsObject(): any {
return {
keyActionType: keyActionType.SwitchLayerAction,
layer: KeyLayer[this.layer],
layer: LayerName[this.layer],
toggle: this.isLayerToggleable
};
}