zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
Leon Hofmeister 2020-10-10 14:27:17 +02:00
parent 31e27ae2e0
commit a6bcc68cb4
Signed by: delvh
GPG Key ID: 3DECE05F6D9A647C
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/envoy/client/data/shortcuts/EnvoyShortcutConfig.java
View File

@ -5,6 +5,7 @@ import javafx.scene.input.*;
import envoy.client.data.Context; import envoy.client.data.Context;
import envoy.client.helper.ShutdownHelper; import envoy.client.helper.ShutdownHelper;
import envoy.client.ui.SceneContext.SceneInfo; import envoy.client.ui.SceneContext.SceneInfo;
import envoy.client.util.UserUtil;
/** /**
* Envoy-specific implementation of the keyboard-shortcut interaction offered by * Envoy-specific implementation of the keyboard-shortcut interaction offered by
@ -30,7 +31,7 @@ public class EnvoyShortcutConfig {
// Add the option to logout using "Control"+"Shift"+"L" if not in login scene // Add the option to logout using "Control"+"Shift"+"L" if not in login scene
instance.addForNotExcluded(new KeyCodeCombination(KeyCode.L, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN), instance.addForNotExcluded(new KeyCodeCombination(KeyCode.L, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN),
ShutdownHelper::logout, UserUtil::logout,
SceneInfo.LOGIN_SCENE); SceneInfo.LOGIN_SCENE);
// Add option to open settings scene with "Control"+"S", if not in login scene // Add option to open settings scene with "Control"+"S", if not in login scene