8000 FIX: port the key handling changes from mpl by tacaswell · Pull Request #310 · matplotlib/ipympl · GitHub
[go: up one dir, main page]
Skip to content

FIX: port the key handling changes from mpl #310

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

Merged
merged 1 commit into from
Mar 19, 2021
Merged

FIX: port the key handling changes from mpl #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 63 additions & 0 deletions ipympl/backend_nbagg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
default
)

import matplotlib
from matplotlib import rcParams
from matplotlib.figure import Figure
from matplotlib import is_interactive
Expand Down Expand Up @@ -241,6 +242,68 @@ def send_binary(self, data):
def new_timer(self, *args, **kwargs):
return TimerTornado(*args, **kwargs)

if matplotlib.__version__ < '3.4':
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

woah neat! I had no idea this was a thing you can do

# backport the Python side changes to match the js changes
def _handle_key(self, event):
_SPECIAL_KEYS_LUT = {'Alt': 'alt',
'AltGraph': 'alt',
'CapsLock': 'caps_lock',
'Control': 'control',
'Meta': 'meta',
'NumLock': 'num_lock',
'ScrollLock': 'scroll_lock',
'Shift': 'shift',
'Super': 'super',
'Enter': 'enter',
'Tab': 'tab',
'ArrowDown': 'down',
'ArrowLeft': 'left',
'ArrowRight': 'right',
'ArrowUp': 'up',
'End': 'end',
'Home': 'home',
'PageDown': 'pagedown',
'PageUp': 'pageup',
'Backspace': 'backspace',
'Delete': 'delete',
'Insert': 'insert',
'Escape': 'escape',
'Pause': 'pause',
'Select': 'select',
'Dead': 'dead',
'F1': 'f1',
'F2': 'f2',
'F3': 'f3',
'F4': 'f4',
'F5': 'f5',
'F6': 'f6',
'F7': 'f7',
'F8': 'f8',
'F9': 'f9',
'F10': 'f10',
'F11': 'f11',
'F12': 'f12'}

def handle_key(key):
"""Handle key values"""
value = key[key.index('k') + 1:]
if 'shift+' in key:
if len(value) == 1:
key = key.replace('shift+', '')
if value in _SPECIAL_KEYS_LUT:
value = _SPECIAL_KEYS_LUT[value]
key = key[:key.index('k')] + value
return key

key = handle_key(event['key'])
e_type = event['type']
guiEvent = event.get('guiEvent', None)
if e_type == 'key_press':
self.key_press_event(key, guiEvent=guiEvent)
elif e_type == 'key_release':
self.key_release_event(key, guiEvent=guiEvent)
handle_key_press = handle_key_release = _handle_key


class FigureManager(FigureManagerWebAgg):
ToolbarCls = Toolbar
Expand Down
20 changes: 8 additions & 12 deletions js/src/mpl_widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,31 +644,27 @@ export class MPLCanvasView extends widgets.DOMWidgetView {
event.preventDefault();

// Prevent repeat events
if (name == 'key_press') {
if (event.which === this._key) {
if (name === 'key_press') {
if (event.key === this._key) {
return;
} else {
this._key = event.which;
this._key = event.key;
}
}
if (name == 'key_release') {
if (name === 'key_release') {
this._key = null;
}

var value = '';
700F if (event.ctrlKey && event.which != 17) {
if (event.ctrlKey && event.key !== 'Control') {
value += 'ctrl+';
}
if (event.altKey && event.which != 18) {
} else if (event.altKey && event.key !== 'Alt') {
value += 'alt+';
}
if (event.shiftKey && event.which != 16) {
} else if (event.shiftKey && event.key !== 'Shift') {
value += 'shift+';
}

value += 'k';
value += event.which.toString();

value += 'k' + event.key;
this.model.send_message(name, {
key: value,
guiEvent: utils.get_simple_keys(event),
Expand Down
0