diff --git a/app/controllers/editors/EditorsController.js b/app/controllers/editors/EditorsController.js index 2774d47..15e0458 100644 --- a/app/controllers/editors/EditorsController.js +++ b/app/controllers/editors/EditorsController.js @@ -38,7 +38,7 @@ class EditorsController extends EICController { static: true, expanded: false, withSettings: true, - windowStyle: this._boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }), + windowStyle: EICDomContent.boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }), }, { models: models, @@ -57,7 +57,7 @@ class EditorsController extends EICController { static: true, expanded: false, withSettings: true, - windowStyle: this._boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }), + windowStyle: EICDomContent.boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }), }, { models: models, diff --git a/app/controllers/live/DashboardsController.js b/app/controllers/live/DashboardsController.js index d27d0ef..cce5286 100644 --- a/app/controllers/live/DashboardsController.js +++ b/app/controllers/live/DashboardsController.js @@ -43,7 +43,7 @@ class DashboardsController extends EICController { static: true, expanded: false, withSettings: true, - windowStyle: this._boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }), + windowStyle: EICDomContent.boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }), }, { models: models, @@ -62,7 +62,7 @@ class DashboardsController extends EICController { static: true, expanded: false, withSettings: true, - windowStyle: this._boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }), + windowStyle: EICDomContent.boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }), }, { models: models, diff --git a/app/libs/EIC/EICController.js b/app/libs/EIC/EICController.js index 0365b5d..c20637f 100755 --- a/app/libs/EIC/EICController.js +++ b/app/libs/EIC/EICController.js @@ -371,6 +371,7 @@ class EICController extends Controller { static resize() { Controller._contents.forEach(item => item.view.DOMContentResized()) } + } app.registerClass('EICController', EICController); \ No newline at end of file diff --git a/app/libs/EIC/EICDomContent.js b/app/libs/EIC/EICDomContent.js index 4a0d626..e9118bd 100755 --- a/app/libs/EIC/EICDomContent.js +++ b/app/libs/EIC/EICDomContent.js @@ -262,7 +262,26 @@ class EICDomContent extends View { let device = limits.find(item => item.min < bounds.width); this.el.setAttribute('device', device ? device.name: limits[0].name); } - + + static boxFromPrefs(viewName, defaults){ + function getPref(path) { + return path.split('.').reduce( + (acc, key) => acc?.[key], + app.User.preferences.windows + ) + } + const box = getPref(viewName) + let left = box.x ? box.x : defaults.x + let top = box.y ? box.y : defaults.y + let width = box.w ? box.w : defaults.w + let height = box.x ? box.h : defaults.h + return({ + width: `${width}px`, + height: `${height}px`, + left: `${left}px`, + top: `${top}px`, + }) + } } app.registerClass('EICDomContent', EICDomContent); \ No newline at end of file