Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-30 04:13:15 +01:00
Code Issues Projects Releases Wiki Activity

bring main menu back

Browse source
This commit is contained in:
Val Erastov 2018-11-30 19:32:35 -08:00
parent bb5440caa3
commit 28d863a52e
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/ui/components/AdjustableAbs.jsx
View file

@ -17,13 +17,12 @@ export class Adjuster extends React.Component {
let h = this.el.offsetHeight;
let holder = this.el.parentNode;
const fit = (prop, dim, holderDim) => {
let pos = this.props[prop];
const fit = (prop, pos, dim, holderDim) => {
if (pos !== undefined) {
if (pos + dim > holderDim) {
pos = (holderDim - dim) - 5;
}
this.el.style[prop] = pos + 'px';
this.el.style[prop] = Math.round(pos) + 'px';
}
};
@ -31,23 +30,23 @@ export class Adjuster extends React.Component {
if (centered) {
if (right !== undefined) {
this.el.style.right = (right + w * 0.5) + 'px';
right = (right + w * 0.5);
}
if (left !== undefined) {
this.el.style.left = (left - w * 0.5) + 'px';
left = (left - w * 0.5);
}
if (bottom !== undefined) {
this.el.style.bottom = (bottom + h * 0.5) + 'px';
bottom = (bottom + h * 0.5);
}
if (top !== undefined) {
this.el.style.top = (top - h * 0.5) + 'px';
top = (top - h * 0.5);
}
}
fit('left', w, holder.offsetWidth);
fit('right', w, holder.offsetWidth);
fit('top', h, holder.offsetHeight);
fit('bottom', h, holder.offsetHeight);
fit('left', left, w, holder.offsetWidth);
fit('right', right,w, holder.offsetWidth);
fit('top', top, h, holder.offsetHeight);
fit('bottom', bottom, h, holder.offsetHeight);
this.el.style.visibility = 'visible';
};

2
web/app/cad/keyboard/keyboardPlugin.js
View file

@ -9,7 +9,7 @@ export function activate({services, streams}) {
//to attach to a dom element: Mousetrap(domElement).bind(...
for (let action of Object.keys(keymap)) {
const dataProvider = getDataProvider(action, services);
Mousetrap.bind(keymap[action], () => services.action.run(actionToken, dataProvider ? dataProvider() : undefined));
Mousetrap.bind(keymap[action], () => services.action.run(action, dataProvider ? dataProvider() : undefined));
}
Mousetrap.bind('esc', services.menu.closeAll)
}