diff options
-rw-r--r-- | src/index.js | 4 | ||||
-rw-r--r-- | src/stores/AppStore.js | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/index.js b/src/index.js index e21666086..6a08e5e5a 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -39,7 +39,9 @@ if (isSecondInstance) { | |||
39 | 39 | ||
40 | // Lets disable Hardware Acceleration until we have a better solution | 40 | // Lets disable Hardware Acceleration until we have a better solution |
41 | // to deal with the high-perf-gpu requirement of some services | 41 | // to deal with the high-perf-gpu requirement of some services |
42 | app.disableHardwareAcceleration(); | 42 | |
43 | // Disabled to test tweetdeck glitches | ||
44 | // app.disableHardwareAcceleration(); | ||
43 | 45 | ||
44 | // Initialize Settings | 46 | // Initialize Settings |
45 | const settings = new Settings(); | 47 | const settings = new Settings(); |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 14bdab094..3eb2c38d2 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -127,16 +127,22 @@ export default class AppStore extends Store { | |||
127 | 127 | ||
128 | // Set active the next service | 128 | // Set active the next service |
129 | key( | 129 | key( |
130 | '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => { | 130 | '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => { |
131 | this.actions.service.setActiveNext(); | 131 | this.actions.service.setActiveNext(); |
132 | }); | 132 | }); |
133 | 133 | ||
134 | // Set active the prev service | 134 | // Set active the prev service |
135 | key( | 135 | key( |
136 | '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => { | 136 | '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => { |
137 | this.actions.service.setActivePrev(); | 137 | this.actions.service.setActivePrev(); |
138 | }); | 138 | }); |
139 | 139 | ||
140 | // Global Mute | ||
141 | key( | ||
142 | '⌘+shift+m ctrl+shift+m', () => { | ||
143 | this.actions.app.toggleMuteApp(); | ||
144 | }); | ||
145 | |||
140 | this.locale = this._getDefaultLocale(); | 146 | this.locale = this._getDefaultLocale(); |
141 | 147 | ||
142 | this._healthCheck(); | 148 | this._healthCheck(); |