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.

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

fix: fullscreen keybinding conflict with F11 with activeViewlet #952

Merged
merged 2 commits into from
Jul 13, 2024
Merged

fix: fullscreen keybinding conflict with F11 with activeViewlet #952

merged 2 commits into from
Jul 13, 2024

Conversation

shivapoudel
Copy link
Contributor

As the PR title suggests, this fixes key bindings collisions with Fullscreen mode.

@shivapoudel shivapoudel changed the title Fix - Fullscreen keybinding conflict with F11 with activeViewlet fix - Fullscreen keybinding conflict with F11 with activeViewlet Feb 1, 2024
@shivapoudel shivapoudel changed the title fix - Fullscreen keybinding conflict with F11 with activeViewlet fix: fullscreen keybinding conflict with F11 with activeViewlet Feb 1, 2024
@zobo
Copy link
Contributor

zobo commented Feb 2, 2024

Hi! Thanks, will look at it and compare to what VS does with full screen case.

@shivapoudel
Copy link
Contributor Author

@zobo Any updates on this?

@zobo
Copy link
Contributor

zobo commented Jul 13, 2024

Will review again asap and check with debug-js...

@zobo
Copy link
Contributor

zobo commented Jul 13, 2024

Sorry for not getting to this before. Looks like node debugger does this too, at least for F11 https://github.com/microsoft/vscode-js-debug/blob/1d104b5184736677ab5cc280c70bbd227403850c/src/build/generate-contributions.ts#L1567

This is how the compiled version looks like:

    "keybindings": [{
      "command": "extension.node-debug.startWithStopOnEntry",
      "key": "F10",
      "mac": "F10",
      "when": "debugConfigurationType == pwa-node && !inDebugMode || debugConfigurationType == pwa-extensionHost && !inDebugMode || debugConfigurationType == node && !inDebugMode"
    }, {
      "command": "extension.node-debug.startWithStopOnEntry",
      "key": "F11",
      "mac": "F11",
      "when": "debugConfigurationType == pwa-node && !inDebugMode && activeViewlet == workbench.view.debug || debugConfigurationType == pwa-extensionHost && !inDebugMode && activeViewlet == workbench.view.debug || debugConfigurationType == node && !inDebugMode && activeViewlet == workbench.view.debug"
    }],

So I'm going to update the code to include the activeViewlet case only for F11 - same thing as Microsoft does, and roll this into the next release I plan to do in a couple of days.

@zobo zobo changed the base branch from main to next July 13, 2024 21:35
@zobo zobo merged commit 9be8a99 into xdebug:next Jul 13, 2024
7 checks passed
zobo added a commit that referenced this pull request Jul 15, 2024
* Fix - Fullscreen keybinding conflict with F11 with activeViewlet

* Remove activeViewlet case for F10

---------

Co-authored-by: Damjan Cvetko <[email protected]>
@zobo zobo mentioned this pull request Jul 16, 2024
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants