Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Screencast mode fixes #72694

Closed
wants to merge 20 commits into from
Closed

Screencast mode fixes #72694

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c635c18
fixes overflow in screencast mode
BaibhaVatsa Feb 14, 2019
dce8b5f
Added fixes for 68849, 66675, and 67965
BaibhaVatsa Feb 24, 2019
8f3a911
fixes overflow in screencast mode
BaibhaVatsa Feb 14, 2019
264bf60
Added fixes for 68849, 66675, and 67965
BaibhaVatsa Feb 24, 2019
96571bc
adding fix
BaibhaVatsa Mar 20, 2019
23f894c
chords and equality
BaibhaVatsa Apr 21, 2019
24589e5
Merge remote-tracking branch 'origin/fix-67965' into fix-67965
BaibhaVatsa Apr 21, 2019
13b3132
removed useless variable declarations
BaibhaVatsa Apr 21, 2019
5bafaf6
corrected the variable full length bug
BaibhaVatsa Apr 21, 2019
cae9660
replaced numbers with literals
BaibhaVatsa Apr 21, 2019
7d21351
fixes overflow in screencast mode
BaibhaVatsa Feb 14, 2019
636d218
Added fixes for 68849, 66675, and 67965
BaibhaVatsa Feb 24, 2019
c420f1c
adding fix
BaibhaVatsa Mar 20, 2019
55aa1cf
chords and equality
BaibhaVatsa Apr 21, 2019
881fa7b
fixes overflow in screencast mode
BaibhaVatsa Feb 14, 2019
ecfe376
Added fixes for 68849, 66675, and 67965
BaibhaVatsa Feb 24, 2019
19b44e8
removed useless variable declarations
BaibhaVatsa Apr 21, 2019
b761f93
corrected the variable full length bug
BaibhaVatsa Apr 21, 2019
fc3192b
replaced numbers with literals
BaibhaVatsa Apr 21, 2019
bc43514
Merge remote-tracking branch 'origin/screencast-mode-fixes' into scre…
BaibhaVatsa Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions src/vs/workbench/electron-browser/actions/developerActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Context } from 'vs/platform/contextkey/browser/contextKeyService';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { timeout } from 'vs/base/common/async';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { KeyCode } from 'vs/base/common/keyCodes';

export class ToggleDevToolsAction extends Action {

Expand Down Expand Up @@ -170,7 +171,7 @@ export class ToggleScreencastModeAction extends Action {
const keyboardMarker = append(container, $('div'));
keyboardMarker.style.position = 'absolute';
keyboardMarker.style.backgroundColor = 'rgba(0, 0, 0 ,0.5)';
keyboardMarker.style.width = '100%';
keyboardMarker.style.width = '80%';
keyboardMarker.style.height = '100px';
keyboardMarker.style.bottom = '20%';
keyboardMarker.style.left = '0';
Expand All @@ -181,9 +182,11 @@ export class ToggleScreencastModeAction extends Action {
keyboardMarker.style.textAlign = 'center';
keyboardMarker.style.fontSize = '56px';
keyboardMarker.style.display = 'none';

const onKeyDown = domEvent(container, 'keydown', true);
keyboardMarker.style.paddingLeft = '10%';
keyboardMarker.style.paddingRight = '10%';
const onKeyDown = domEvent(document.body, 'keydown', true);
let keyboardTimeout: IDisposable = Disposable.None;
let isChord: boolean = false;

const keyboardListener = onKeyDown(e => {
keyboardTimeout.dispose();
Expand All @@ -192,10 +195,30 @@ export class ToggleScreencastModeAction extends Action {
const keybinding = this.keybindingService.resolveKeyboardEvent(event);
const label = keybinding.getLabel();

if (!event.ctrlKey && !event.altKey && !event.metaKey && !event.shiftKey && this.keybindingService.mightProducePrintableCharacter(event) && label) {
keyboardMarker.textContent += ' ' + label;
if (event.ctrlKey || event.altKey || event.metaKey) {
if (isChord) {
keyboardMarker.textContent += ' ' + label;
} else {
keyboardMarker.textContent = label;
}
isChord = event.keyCode === KeyCode.KEY_K;
} else if ((keyboardMarker.textContent !== null && label !== null) && (event.keyCode < KeyCode.KEY_0 || (event.keyCode > KeyCode.KEY_Z && event.keyCode < KeyCode.US_SEMICOLON) || event.shiftKey)) {
const lastToken = keyboardMarker.textContent.substr(keyboardMarker.textContent.lastIndexOf(' ') + 1);
if (label.substring(0, lastToken.length) === lastToken) {
if (lastToken.lastIndexOf('+') !== -1 && lastToken.lastIndexOf('+') !== lastToken.length - 1) {
keyboardMarker.textContent += ' ' + label;
} else {
keyboardMarker.textContent = keyboardMarker.textContent.substring(0, keyboardMarker.textContent.lastIndexOf(' ')) + ' ' + label;
}
} else {
keyboardMarker.textContent += ' ' + label;
}
} else {
keyboardMarker.textContent = label;
keyboardMarker.textContent += ' ' + label;
}

while (keyboardMarker.textContent !== null && label !== null && keyboardMarker.scrollHeight > keyboardMarker.clientHeight) {
keyboardMarker.textContent = keyboardMarker.textContent.substring(1);
}

keyboardMarker.style.display = 'block';
Expand Down