safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-324: Speed up animation, show menu when Ctrl-Alt-Shift is pressed.

Browse Source
This commit is contained in:
Michael Jumper
2014-04-18 17:42:03 -07:00
parent f9c9b67e72
commit d3dc38f869
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -1270,21 +1270,11 @@ GuacUI.Client.attach = function(guac) {
guac.sendKeyEvent(0, keysym); guac.sendKeyEvent(0, keysym);
// If lifting up on shift, toggle keyboard if rest of gesture // If lifting up on shift, toggle menu visibility if rest of gesture
// conditions satisfied // conditions satisfied
if (show_keyboard_gesture_possible && keysym === 0xFFE1) { if (show_keyboard_gesture_possible && keysym === 0xFFE1
if (keyboard.pressed[0xFFE3] && keyboard.pressed[0xFFE9]) { && keyboard.pressed[0xFFE3] && keyboard.pressed[0xFFE9])
GuacUI.Client.showMenu(!GuacUI.Client.isMenuShown());
// If in INTERACTIVE mode, switch to OSK
if (GuacUI.StateManager.getState() === GuacUI.Client.states.INTERACTIVE)
GuacUI.StateManager.setState(GuacUI.Client.states.OSK);
// If in OSK mode, switch to INTERACTIVE
else if (GuacUI.StateManager.getState() === GuacUI.Client.states.OSK)
GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
}
}
// Detect if no keys are pressed // Detect if no keys are pressed
var reset_gesture = true; var reset_gesture = true;

8
guacamole/src/main/webapp/styles/client.css
View File

@@ -553,19 +553,19 @@ p.hint {
#menu.closed { #menu.closed {
animation-name: hide-menu; animation-name: hide-menu;
animation-timing-function: linear; animation-timing-function: linear;
animation-duration: 0.125s; animation-duration: 0.03125s;
-webkit-animation-name: hide-menu; -webkit-animation-name: hide-menu;
-webkit-animation-timing-function: linear; -webkit-animation-timing-function: linear;
-webkit-animation-duration: 0.125s; -webkit-animation-duration: 0.03125s;
left: -320px; left: -320px;
} }
#menu.open { #menu.open {
animation-name: show-menu; animation-name: show-menu;
animation-timing-function: linear; animation-timing-function: linear;
animation-duration: 0.125s; animation-duration: 0.03125s;
-webkit-animation-name: show-menu; -webkit-animation-name: show-menu;
-webkit-animation-timing-function: linear; -webkit-animation-timing-function: linear;
-webkit-animation-duration: 0.125s; -webkit-animation-duration: 0.03125s;
left: 0px; left: 0px;
} }