diff --git a/src/js/core/base-layers.js b/src/js/core/base-layers.js index ec5d068..a27fc83 100644 --- a/src/js/core/base-layers.js +++ b/src/js/core/base-layers.js @@ -658,7 +658,8 @@ class Base_layers_class { } /** - * returns global position, for example if canvas is zoomed, it will convert relative mouse position to absolute at 100% zoom. + * returns global position, for example if canvas is zoomed, it will convert relative mouse position to absolute + * at 100% zoom. * * @param {int} x * @param {int} y diff --git a/src/js/core/gui/gui-preview.js b/src/js/core/gui/gui-preview.js index a37b9c5..ae62eed 100644 --- a/src/js/core/gui/gui-preview.js +++ b/src/js/core/gui/gui-preview.js @@ -16,7 +16,7 @@ var template = `
- +
@@ -209,7 +209,7 @@ class GUI_preview_class { this.canvas_preview.stroke(); } - zoom(recalc) { + async zoom(recalc) { if (recalc != undefined) { //zoom-in or zoom-out if (recalc == 1 || recalc == -1) { @@ -275,6 +275,10 @@ class GUI_preview_class { config.need_render = true; this.GUI.prepare_canvas(); + + //sleep after last image import, it maybe not be finished yet + await new Promise(r => setTimeout(r, 10)); + return true; } diff --git a/src/js/modules/file/open.js b/src/js/modules/file/open.js index 2258451..d299802 100644 --- a/src/js/modules/file/open.js +++ b/src/js/modules/file/open.js @@ -428,7 +428,7 @@ class File_open_class { } /** - * includes provided resource (iamge or json) + * includes provided resource (image or json) * * @param string resource_url */ @@ -591,6 +591,9 @@ class File_open_class { const actions = []; + //reset zoom + await this.Base_gui.GUI_preview.zoom(100); //reset zoom + //set attributes actions.push( new app.Actions.Refresh_action_attributes_action('undo'),