Skip to content

Respect the widget layout #184

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
Feb 27, 2020
Merged

Respect the widget layout #184

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
12 changes: 8 additions & 4 deletions js/src/mpl_widget.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.jupyter-matplotlib {
flex: 1 1 auto;
width: auto;
height: auto;
flex: 1 1 auto;
}

/* Toolbar */

.jupyter-matplotlib-toolbar {
flex: 0 0 auto;
overflow: visible;
}

.jupyter-matplotlib-button {
Expand All @@ -24,11 +24,15 @@
overflow: hidden;
}

.jupyter-matplotlib-canvas_div {
.jupyter-matplotlib-canvas-container {
overflow: auto;
}

.jupyter-matplotlib-canvas-div {
margin: 2px;
flex: 1 1 auto;
}

.jupyter-matplotlib-canvas_div:focus {
.jupyter-matplotlib-canvas-div:focus {
outline: 1px solid var(--jp-widgets-input-focus-border-color);
}
14 changes: 6 additions & 8 deletions js/src/mpl_widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,17 +339,21 @@ var MPLCanvasView = widgets.DOMWidgetView.extend({
},

_init_canvas: function() {
var canvas_container = document.createElement('div');
canvas_container.classList = 'jupyter-widgets jupyter-matplotlib-canvas-container';
this.figure.appendChild(canvas_container);

var canvas_div = this.canvas_div = document.createElement('div');
canvas_div.style.position = 'relative';
canvas_div.style.clear = 'both';
canvas_div.classList = 'jupyter-widgets jupyter-matplotlib-canvas_div';
canvas_div.classList = 'jupyter-widgets jupyter-matplotlib-canvas-div';

canvas_div.addEventListener('keydown', this.key_event('key_press'));
canvas_div.addEventListener('keyup', this.key_event('key_release'));

// this is important to make the div 'focusable'
canvas_div.setAttribute('tabindex', 0);
this.figure.appendChild(canvas_div);
canvas_container.appendChild(canvas_div);

var canvas = this.canvas = document.createElement('canvas');
canvas.style.display = 'block';
Expand Down Expand Up @@ -520,12 +524,6 @@ var MPLCanvasView = widgets.DOMWidgetView.extend({
step: event.step,
guiEvent: utils.get_simple_keys(event)});
}

/* This prevents the web browser from automatically changing to
* the text insertion cursor when the button is pressed. We want
* to control all of the cursor setting manually through the
* 'cursor' event from matplotlib */
event.preventDefault();
};
},

Expand Down